mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-27 14:13:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Optimize extract()

Browse Source 
# Patch by Brian Shire
This commit is contained in:
Ilia Alshanetsky 2006-12-10 19:43:03 +00:00
parent 6ccde868be
commit e64cb1ae4d
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ext/standard/array.c
View File

@ -1270,15 +1270,13 @@ PHP_FUNCTION(array_search)
/* }}} */
static int php_valid_var_name(char *var_name)
static int php_valid_var_name(char *var_name, int len)
{
int len, i;
int i;
if (!var_name)
return 0;
len = strlen(var_name);
if (!isalpha((int)((unsigned char *)var_name)[0]) && var_name[0] != '_')
return 0;
@ -1409,7 +1407,7 @@ PHP_FUNCTION(extract)
case EXTR_PREFIX_INVALID:
if (final_name.len == 0) {
if (!php_valid_var_name(var_name)) {
if (!php_valid_var_name(var_name, var_name_len)) {
smart_str_appendl(&final_name, Z_STRVAL_PP(prefix), Z_STRLEN_PP(prefix));
smart_str_appendc(&final_name, '_');
smart_str_appendl(&final_name, var_name, var_name_len);
@ -1426,7 +1424,7 @@ PHP_FUNCTION(extract)
if (final_name.len) {
smart_str_0(&final_name);
if (php_valid_var_name(final_name.c)) {
if (php_valid_var_name(final_name.c, final_name.len)) {
if (extract_refs) {
zval **orig_var;