sesser Sat Jan 15 13:30:17 2005 EDT
Modified files:
/php-src/ext/standard var_unserializer.c var_unserializer.re
Log:
and use it...
http://cvs.php.net/diff.php/php-src/ext/standard/var_unserializer.c?r1=1.47&r2=1.48&ty=u
Index: php-src/ext/standard/var_unserializer.c
diff -u php-src/ext/standard/var_unserializer.c:1.47
php-src/ext/standard/var_unserializer.c:1.48
--- php-src/ext/standard/var_unserializer.c:1.47 Sat Jan 15 13:18:08 2005
+++ php-src/ext/standard/var_unserializer.c Sat Jan 15 13:30:16 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: var_unserializer.c,v 1.47 2005/01/15 18:18:08 sesser Exp $ */
+/* $Id: var_unserializer.c,v 1.48 2005/01/15 18:30:16 sesser Exp $ */
#include "php.h"
#include "ext/standard/php_var.h"
@@ -241,14 +241,14 @@
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;
http://cvs.php.net/diff.php/php-src/ext/standard/var_unserializer.re?r1=1.36&r2=1.37&ty=u
Index: php-src/ext/standard/var_unserializer.re
diff -u php-src/ext/standard/var_unserializer.re:1.36
php-src/ext/standard/var_unserializer.re:1.37
--- php-src/ext/standard/var_unserializer.re:1.36 Sat Jan 15 13:18:08 2005
+++ php-src/ext/standard/var_unserializer.re Sat Jan 15 13:30:16 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: var_unserializer.re,v 1.36 2005/01/15 18:18:08 sesser Exp $ */
+/* $Id: var_unserializer.re,v 1.37 2005/01/15 18:30:16 sesser Exp $ */
#include "php.h"
#include "ext/standard/php_var.h"
@@ -244,14 +244,14 @@
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;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
