array_merge[_recursive] is not binary-key safe (patch)
| From: | Matt W | Date: | Fri, 28 Jul 2006 01:14:05 +0000 |
| Subject: | array_merge[_recursive] is not binary-key safe (patch) | ||
| Groups: | php.internals | ||
| Request: | Send a blank email to internals+get-25024@lists.php.net to get a copy of this message | ||
Hi,
Happened to notice this. Only in 5.2.
Thanks,
Matt
Index: ext/standard/array.c =================================================================== RCS file: /repository/php-src/ext/standard/array.c,v retrieving revision 1.308.2.21.2.8 diff -u -r1.308.2.21.2.8 array.c --- ext/standard/array.c 24 Jul 2006 18:18:33 -0000 1.308.2.21.2.8 +++ ext/standard/array.c 28 Jul 2006 01:00:00 -0000 @@ -2328,7 +2328,7 @@ } else { (*src_entry)->refcount++; - zend_hash_update(dest, string_key, strlen(string_key)+1, + zend_hash_update(dest, string_key, string_key_len, src_entry, sizeof(zval *), NULL); } break;
Index: ext/standard/array.c =================================================================== RCS file: /repository/php-src/ext/standard/array.c,v retrieving revision 1.308.2.21.2.8 diff -u -r1.308.2.21.2.8 array.c --- ext/standard/array.c 24 Jul 2006 18:18:33 -0000 1.308.2.21.2.8 +++ ext/standard/array.c 28 Jul 2006 01:00:00 -0000 @@ -2328,7 +2328,7 @@ } else { (*src_entry)->refcount++; - zend_hash_update(dest, string_key, strlen(string_key)+1, + zend_hash_update(dest, string_key, string_key_len, src_entry, sizeof(zval *), NULL); } break;