Browse Source

Make array_merge(_recursive) handle binary keys safely. (Patch by Matt W)

PECL_OPENSSL
Andrei Zmievski 20 years ago
parent
commit
3d7a1c3972
  1. 2
      ext/standard/array.c

2
ext/standard/array.c

@ -2328,7 +2328,7 @@ PHPAPI int php_array_merge(HashTable *dest, HashTable *src, int recursive TSRMLS
} 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;

Loading…
Cancel
Save