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

and use it...

Browse source
This commit is contained in:
Stefan Esser 2005-01-15 18:30:16 +00:00
parent f8787a67ed
commit 135fee7f10
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ext/standard/var_unserializer.c
View file

@ -241,14 +241,14 @@ static inline int process_nested_data(UNSERIALIZE_PARAMETER, HashTable *ht, int
switch (Z_TYPE_P(key)) { switch (Z_TYPE_P(key)) {
case IS_LONG: case IS_LONG:
if (zend_hash_index_find(ht, Z_LVAL_P(key), (void **)&old_data)) { if (zend_hash_index_find(ht, Z_LVAL_P(key), (void **)&old_data)==SUCCESS) {
var_replace(var_hash, old_data, rval); var_push_dtor(var_hash, old_data);
} }
zend_hash_index_update(ht, Z_LVAL_P(key), &data, sizeof(data), NULL); zend_hash_index_update(ht, Z_LVAL_P(key), &data, sizeof(data), NULL);
break; break;
case IS_STRING: case IS_STRING:
if (zend_hash_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)) { if (zend_hash_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)==SUCCESS) {
var_replace(var_hash, old_data, rval); var_push_dtor(var_hash, old_data);
} }
zend_hash_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &data, sizeof(data), NULL); zend_hash_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &data, sizeof(data), NULL);
break; break;

8
ext/standard/var_unserializer.re
View file

@ -244,14 +244,14 @@ static inline int process_nested_data(UNSERIALIZE_PARAMETER, HashTable *ht, int
switch (Z_TYPE_P(key)) { switch (Z_TYPE_P(key)) {
case IS_LONG: case IS_LONG:
if (zend_hash_index_find(ht, Z_LVAL_P(key), (void **)&old_data)) { if (zend_hash_index_find(ht, Z_LVAL_P(key), (void **)&old_data)==SUCCESS) {
var_replace(var_hash, old_data, rval); var_push_dtor(var_hash, old_data);
} }
zend_hash_index_update(ht, Z_LVAL_P(key), &data, sizeof(data), NULL); zend_hash_index_update(ht, Z_LVAL_P(key), &data, sizeof(data), NULL);
break; break;
case IS_STRING: case IS_STRING:
if (zend_hash_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)) { if (zend_hash_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)==SUCCESS) {
var_replace(var_hash, old_data, rval); var_push_dtor(var_hash, old_data);
} }
zend_hash_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &data, sizeof(data), NULL); zend_hash_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &data, sizeof(data), NULL);
break; break;