archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed bug #33958 (duplicate cookies and magic_quotes=off may cause a crash)

Browse source
This commit is contained in:
Ilia Alshanetsky 2005-08-02 17:01:05 +00:00
parent 9f6e05964f
commit 990f7043d9
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
NEWS
View file

@ -3,6 +3,8 @@ PHP NEWS
?? ??? 2005, PHP 5.1 ?? ??? 2005, PHP 5.1
- Fixed bug #33967 (misuse of Exception constructor doesn't display errorfile). - Fixed bug #33967 (misuse of Exception constructor doesn't display errorfile).
(Jani) (Jani)
- Fixed bug #33958 (duplicate cookies and magic_quotes=off may cause a crash).
(Ilia)
- 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). - Fixed bug #33904 (input array keys being escaped when magic quotes is off).
(Ilia) (Ilia)

4
main/php_variables.c
View file

@ -198,7 +198,9 @@ plain_var:
*/ */
if (PG(http_globals)[TRACK_VARS_COOKIE] && symtable1 == Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_COOKIE]) && if (PG(http_globals)[TRACK_VARS_COOKIE] && symtable1 == Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_COOKIE]) &&
zend_symtable_find(symtable1, escaped_index, index_len+1, (void **) &tmp) != FAILURE) { zend_symtable_find(symtable1, escaped_index, index_len+1, (void **) &tmp) != FAILURE) {
efree(escaped_index); if (PG(magic_quotes_gpc)) {
efree(escaped_index);
}
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);