summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS1
-rwxr-xr-xext/spl/spl_array.c4
-rwxr-xr-xext/spl/tests/array_018.phptbin688 -> 633 bytes
3 files changed, 1 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index ead7b83256..96d6dade5c 100644
--- a/NEWS
+++ b/NEWS
@@ -33,6 +33,7 @@ PHP NEWS
(Scott)
- Fixed bug #45989 (json_decode() doesn't return NULL on certain invalid
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)
04 Dec 2008, PHP 5.3.0 Alpha 3
diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c
index fb4d12a7de..dd423ab683 100755
--- a/ext/spl/spl_array.c
+++ b/ext/spl/spl_array.c
@@ -433,10 +433,6 @@ static void spl_array_write_dimension_ex(int check_inherited, zval *object, zval
}
switch(Z_TYPE_P(offset)) {
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);
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;
diff --git a/ext/spl/tests/array_018.phpt b/ext/spl/tests/array_018.phpt
index 996d276e04..7c68a6280e 100755
--- a/ext/spl/tests/array_018.phpt
+++ b/ext/spl/tests/array_018.phpt
Binary files differ