mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 18:34:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #33904 (input array keys being escaped when magic quotes is off).

Browse Source
This commit is contained in:
Ilia Alshanetsky 2005-07-29 15:43:37 +00:00
parent f66d5f0cc5
commit 22db404132
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -2,6 +2,8 @@ PHP NEWS
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2005, PHP 5.1 ?? ??? 2005, PHP 5.1
- Fixed bug #33917 (number_format() output with > 1 char separators). (Jani) - Fixed bug #33917 (number_format() output with > 1 char separators). (Jani)
- Fixed bug #33904 (input array keys being escaped when magic quotes is off).
(Ilia)
- Fixed bug #33899 (CLI: setting extension_dir=some/path extension=foobar.so - Fixed bug #33899 (CLI: setting extension_dir=some/path extension=foobar.so
does not work). (Jani) does not work). (Jani)
- Fixed bug #33882 (CLI was looking for php.ini in wrong path). (Hartmut) - Fixed bug #33882 (CLI was looking for php.ini in wrong path). (Hartmut)

12
main/php_variables.c
View File

@ -183,7 +183,13 @@ plain_var:
zend_hash_next_index_insert(symtable1, &gpc_element, sizeof(zval *), (void **) &gpc_element_p); zend_hash_next_index_insert(symtable1, &gpc_element, sizeof(zval *), (void **) &gpc_element_p);
} else { } else {
zval **tmp; zval **tmp;
char *escaped_index = php_addslashes(index, index_len, &index_len, 0 TSRMLS_CC); char *escaped_index;
if (PG(magic_quotes_gpc)) {
escaped_index = php_addslashes(index, index_len, &index_len, 0 TSRMLS_CC);
} else {
escaped_index = index;
}
/* /*
* According to rfc2965, more specific paths are listed above the less specific ones. * According to rfc2965, more specific paths are listed above the less specific ones.
* If we encounter a duplicate cookie name, we should skip it, since it is not possible * If we encounter a duplicate cookie name, we should skip it, since it is not possible
@ -196,7 +202,9 @@ plain_var:
break; break;
} }
zend_symtable_update(symtable1, escaped_index, index_len + 1, &gpc_element, sizeof(zval *), (void **) &gpc_element_p); zend_symtable_update(symtable1, escaped_index, index_len + 1, &gpc_element, sizeof(zval *), (void **) &gpc_element_p);
efree(escaped_index); if (PG(magic_quotes_gpc)) {
efree(escaped_index);
}
} }
break; break;
} }