diff options
| author | Stefan Esser <sesser@php.net> | 2005-01-15 18:30:16 +0000 |
|---|---|---|
| committer | Stefan Esser <sesser@php.net> | 2005-01-15 18:30:16 +0000 |
| commit | 135fee7f10cc2c65c37ece330dd2d5ed9e5cadc0 (patch) | |
| tree | 0ab2ccbaaa28ced467a19dff9078e59ab3b51779 | |
| parent | f8787a67ed195593ee89722ae5e07684877e38c0 (diff) | |
| download | php-git-135fee7f10cc2c65c37ece330dd2d5ed9e5cadc0.tar.gz | |
and use it...
| -rw-r--r-- | ext/standard/var_unserializer.c | 8 | ||||
| -rw-r--r-- | ext/standard/var_unserializer.re | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c index 354ab0fbdc..c1800258d3 100644 --- a/ext/standard/var_unserializer.c +++ b/ext/standard/var_unserializer.c @@ -241,14 +241,14 @@ static inline int process_nested_data(UNSERIALIZE_PARAMETER, HashTable *ht, int switch (Z_TYPE_P(key)) { case IS_LONG: - if (zend_hash_index_find(ht, Z_LVAL_P(key), (void **)&old_data)) { - var_replace(var_hash, old_data, rval); + if (zend_hash_index_find(ht, Z_LVAL_P(key), (void **)&old_data)==SUCCESS) { + var_push_dtor(var_hash, old_data); } zend_hash_index_update(ht, Z_LVAL_P(key), &data, sizeof(data), NULL); break; case IS_STRING: - if (zend_hash_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)) { - var_replace(var_hash, old_data, rval); + if (zend_hash_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)==SUCCESS) { + var_push_dtor(var_hash, old_data); } zend_hash_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &data, sizeof(data), NULL); break; diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re index 4d0ea6c3dc..e345240028 100644 --- a/ext/standard/var_unserializer.re +++ b/ext/standard/var_unserializer.re @@ -244,14 +244,14 @@ static inline int process_nested_data(UNSERIALIZE_PARAMETER, HashTable *ht, int switch (Z_TYPE_P(key)) { case IS_LONG: - if (zend_hash_index_find(ht, Z_LVAL_P(key), (void **)&old_data)) { - var_replace(var_hash, old_data, rval); + if (zend_hash_index_find(ht, Z_LVAL_P(key), (void **)&old_data)==SUCCESS) { + var_push_dtor(var_hash, old_data); } zend_hash_index_update(ht, Z_LVAL_P(key), &data, sizeof(data), NULL); break; case IS_STRING: - if (zend_hash_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)) { - var_replace(var_hash, old_data, rval); + if (zend_hash_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)==SUCCESS) { + var_push_dtor(var_hash, old_data); } zend_hash_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &data, sizeof(data), NULL); break; |