sesser Sun Jan 16 17:02:52 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/standard var_unserializer.c var_unserializer.re
Log:
if 2 of 3 tests are okay still do the 3rd test !
http://cvs.php.net/diff.php/php-src/ext/standard/var_unserializer.c?r1=1.38.2.5&r2=1.38.2.6&ty=u
Index: php-src/ext/standard/var_unserializer.c
diff -u php-src/ext/standard/var_unserializer.c:1.38.2.5
php-src/ext/standard/var_unserializer.c:1.38.2.6
--- php-src/ext/standard/var_unserializer.c:1.38.2.5 Sat Jan 15 13:49:25 2005
+++ php-src/ext/standard/var_unserializer.c Sun Jan 16 17:02:50 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: var_unserializer.c,v 1.38.2.5 2005/01/15 18:49:25 sesser Exp $ */
+/* $Id: var_unserializer.c,v 1.38.2.6 2005/01/16 22:02:50 sesser Exp $ */
#include "php.h"
#include "ext/standard/php_var.h"
@@ -56,9 +56,9 @@
var_hash->data[var_hash->used_slots++] = *rval;
}
-static inline void var_push(php_unserialize_data_t *var_hashx, zval **rval)
+static inline void var_push_dtor(php_unserialize_data_t *var_hashx, zval
**rval)
{
- var_entries *var_hash = var_hashx->first, *prev = NULL;
+ var_entries *var_hash = var_hashx->first_dtor, *prev = NULL;
while (var_hash && var_hash->used_slots == VAR_ENTRIES_MAX) {
prev = var_hash;
@@ -70,12 +70,13 @@
var_hash->used_slots = 0;
var_hash->next = 0;
- if (!var_hashx->first)
- var_hashx->first = var_hash;
+ if (!var_hashx->first_dtor)
+ var_hashx->first_dtor = var_hash;
else
prev->next = var_hash;
}
+ (*rval)->refcount++;
var_hash->data[var_hash->used_slots++] = *rval;
}
http://cvs.php.net/diff.php/php-src/ext/standard/var_unserializer.re?r1=1.27.2.5&r2=1.27.2.6&ty=u
Index: php-src/ext/standard/var_unserializer.re
diff -u php-src/ext/standard/var_unserializer.re:1.27.2.5
php-src/ext/standard/var_unserializer.re:1.27.2.6
--- php-src/ext/standard/var_unserializer.re:1.27.2.5 Sat Jan 15 13:49:25 2005
+++ php-src/ext/standard/var_unserializer.re Sun Jan 16 17:02:50 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: var_unserializer.re,v 1.27.2.5 2005/01/15 18:49:25 sesser Exp $ */
+/* $Id: var_unserializer.re,v 1.27.2.6 2005/01/16 22:02:50 sesser Exp $ */
#include "php.h"
#include "ext/standard/php_var.h"
@@ -54,9 +54,9 @@
var_hash->data[var_hash->used_slots++] = *rval;
}
-static inline void var_push(php_unserialize_data_t *var_hashx, zval **rval)
+static inline void var_push_dtor(php_unserialize_data_t *var_hashx, zval
**rval)
{
- var_entries *var_hash = var_hashx->first, *prev = NULL;
+ var_entries *var_hash = var_hashx->first_dtor, *prev = NULL;
while (var_hash && var_hash->used_slots == VAR_ENTRIES_MAX) {
prev = var_hash;
@@ -68,12 +68,13 @@
var_hash->used_slots = 0;
var_hash->next = 0;
- if (!var_hashx->first)
- var_hashx->first = var_hash;
+ if (!var_hashx->first_dtor)
+ var_hashx->first_dtor = var_hash;
else
prev->next = var_hash;
}
+ (*rval)->refcount++;
var_hash->data[var_hash->used_slots++] = *rval;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
