sesser Fri Dec 3 11:02:48 2004 EDT
Modified files:
/php-src/ext/standard var_unserializer.c var_unserializer.re
Log:
Handle already existing elements correctly
http://cvs.php.net/diff.php/php-src/ext/standard/var_unserializer.c?r1=1.45&r2=1.46&ty=u
Index: php-src/ext/standard/var_unserializer.c
diff -u php-src/ext/standard/var_unserializer.c:1.45
php-src/ext/standard/var_unserializer.c:1.46
--- php-src/ext/standard/var_unserializer.c:1.45 Wed Dec 1 17:42:00 2004
+++ php-src/ext/standard/var_unserializer.c Fri Dec 3 11:02:48 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: var_unserializer.c,v 1.45 2004/12/01 22:42:00 sesser Exp $ */
+/* $Id: var_unserializer.c,v 1.46 2004/12/03 16:02:48 sesser Exp $ */
#include "php.h"
#include "ext/standard/php_var.h"
@@ -65,7 +65,7 @@
for (i = 0; i < var_hash->used_slots; i++) {
if (var_hash->data[i] == ozval) {
var_hash->data[i] = *nzval;
- return;
+ /* do not break here */
}
}
var_hash = var_hash->next;
@@ -177,7 +177,7 @@
static inline int process_nested_data(UNSERIALIZE_PARAMETER, HashTable *ht,
int elements)
{
while (elements-- > 0) {
- zval *key, *data;
+ zval *key, *data, *old_data;
ALLOC_INIT_ZVAL(key);
@@ -205,9 +205,15 @@
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);
+ }
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);
+ }
zend_hash_update(ht, Z_STRVAL_P(key),
Z_STRLEN_P(key) + 1, &data, sizeof(data), NULL);
break;
}
@@ -947,6 +953,8 @@
if (id == -1 || var_access(var_hash, id, &rval_ref) != SUCCESS) {
return 0;
}
+
+ if (*rval == *rval_ref) return 0;
if (*rval != NULL) {
zval_ptr_dtor(rval);
http://cvs.php.net/diff.php/php-src/ext/standard/var_unserializer.re?r1=1.34&r2=1.35&ty=u
Index: php-src/ext/standard/var_unserializer.re
diff -u php-src/ext/standard/var_unserializer.re:1.34
php-src/ext/standard/var_unserializer.re:1.35
--- php-src/ext/standard/var_unserializer.re:1.34 Wed Dec 1 17:42:00 2004
+++ php-src/ext/standard/var_unserializer.re Fri Dec 3 11:02:48 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: var_unserializer.re,v 1.34 2004/12/01 22:42:00 sesser Exp $ */
+/* $Id: var_unserializer.re,v 1.35 2004/12/03 16:02:48 sesser Exp $ */
#include "php.h"
#include "ext/standard/php_var.h"
@@ -63,7 +63,7 @@
for (i = 0; i < var_hash->used_slots; i++) {
if (var_hash->data[i] == ozval) {
var_hash->data[i] = *nzval;
- return;
+ /* do not break here */
}
}
var_hash = var_hash->next;
@@ -180,7 +180,7 @@
static inline int process_nested_data(UNSERIALIZE_PARAMETER, HashTable *ht,
int elements)
{
while (elements-- > 0) {
- zval *key, *data;
+ zval *key, *data, *old_data;
ALLOC_INIT_ZVAL(key);
@@ -208,9 +208,15 @@
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);
+ }
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);
+ }
zend_hash_update(ht, Z_STRVAL_P(key),
Z_STRLEN_P(key) + 1, &data, sizeof(data), NULL);
break;
}
@@ -321,6 +327,8 @@
return 0;
}
+ if (*rval == *rval_ref) return 0;
+
if (*rval != NULL) {
zval_ptr_dtor(rval);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
