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

MFH: Fix #45820 (Empty ArrayObject keys not allowed)

Browse source
This commit is contained in:
Etienne Kneuss 2008-12-30 23:34:29 +00:00
parent 826cc0dc3d
commit b296c25ba2
3 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
NEWS
View file

@ -33,6 +33,7 @@ PHP NEWS
(Scott) (Scott)
- Fixed bug #45989 (json_decode() doesn't return NULL on certain invalid - Fixed bug #45989 (json_decode() doesn't return NULL on certain invalid
strings). (magicaltux, Scott) strings). (magicaltux, Scott)
- Fixed bug #45820 (Allow empty keys in ArrayObject). (Etienne)
- Fixed bug #45791 (json_decode() doesn't convert 0e0 to a double). (Scott) - Fixed bug #45791 (json_decode() doesn't convert 0e0 to a double). (Scott)
04 Dec 2008, PHP 5.3.0 Alpha 3 04 Dec 2008, PHP 5.3.0 Alpha 3

4
ext/spl/spl_array.c
View file

@ -433,10 +433,6 @@ static void spl_array_write_dimension_ex(int check_inherited, zval *object, zval
} }
switch(Z_TYPE_P(offset)) { switch(Z_TYPE_P(offset)) {
case IS_STRING: case IS_STRING:
if (*Z_STRVAL_P(offset) == '\0') {
zend_throw_exception(spl_ce_InvalidArgumentException, "An offset must not begin with \\0 or be empty", 0 TSRMLS_CC);
return;
}
Z_ADDREF_P(value); Z_ADDREF_P(value);
zend_symtable_update(spl_array_get_hash_table(intern, 0 TSRMLS_CC), Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, (void**)&value, sizeof(void*), NULL); zend_symtable_update(spl_array_get_hash_table(intern, 0 TSRMLS_CC), Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, (void**)&value, sizeof(void*), NULL);
return; return;

BIN
ext/spl/tests/array_018.phpt
View file

Binary file not shown.