sesser Sat Jan 15 13:44:30 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/standard php_var.h var_unserializer.c
var_unserializer.re
Log:
MFH
http://cvs.php.net/diff.php/php-src/ext/standard/php_var.h?r1=1.21.4.4&r2=1.21.4.5&ty=u
Index: php-src/ext/standard/php_var.h
diff -u php-src/ext/standard/php_var.h:1.21.4.4
php-src/ext/standard/php_var.h:1.21.4.5
--- php-src/ext/standard/php_var.h:1.21.4.4 Fri Sep 24 17:57:18 2004
+++ php-src/ext/standard/php_var.h Sat Jan 15 13:44:29 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_var.h,v 1.21.4.4 2004/09/24 21:57:18 helly Exp $ */
+/* $Id: php_var.h,v 1.21.4.5 2005/01/15 18:44:29 sesser Exp $ */
#ifndef PHP_VAR_H
#define PHP_VAR_H
@@ -41,6 +41,7 @@
struct php_unserialize_data {
void *first;
+ void *first_dtor;
};
typedef struct php_unserialize_data php_unserialize_data_t;
@@ -54,7 +55,8 @@
zend_hash_destroy(&(var_hash))
#define PHP_VAR_UNSERIALIZE_INIT(var_hash) \
- (var_hash).first = 0
+ (var_hash).first = 0; \
+ (var_hash).first_dtor = 0
#define PHP_VAR_UNSERIALIZE_DESTROY(var_hash) \
var_destroy(&(var_hash))
http://cvs.php.net/diff.php/php-src/ext/standard/var_unserializer.c?r1=1.18.4.14&r2=1.18.4.15&ty=u
Index: php-src/ext/standard/var_unserializer.c
diff -u php-src/ext/standard/var_unserializer.c:1.18.4.14
php-src/ext/standard/var_unserializer.c:1.18.4.15
--- php-src/ext/standard/var_unserializer.c:1.18.4.14 Fri Dec 3 11:09:19 2004
+++ php-src/ext/standard/var_unserializer.c Sat Jan 15 13:44:29 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: var_unserializer.c,v 1.18.4.14 2004/12/03 16:09:19 sesser Exp $ */
+/* $Id: var_unserializer.c,v 1.18.4.15 2005/01/15 18:44:29 sesser Exp $ */
#include "php.h"
#include "ext/standard/php_var.h"
@@ -56,6 +56,30 @@
var_hash->data[var_hash->used_slots++] = *rval;
}
+static inline void var_push_dtor(php_unserialize_data_t *var_hashx, zval
**rval)
+{
+ var_entries *var_hash = var_hashx->first_dtor, *prev = NULL;
+
+ while (var_hash && var_hash->used_slots == VAR_ENTRIES_MAX) {
+ prev = var_hash;
+ var_hash = var_hash->next;
+ }
+
+ if (!var_hash) {
+ var_hash = emalloc(sizeof(var_entries));
+ var_hash->used_slots = 0;
+ var_hash->next = 0;
+
+ 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;
+}
+
PHPAPI void var_replace(php_unserialize_data_t *var_hashx, zval *ozval, zval
**nzval)
{
int i;
@@ -93,6 +117,7 @@
PHPAPI void var_destroy(php_unserialize_data_t *var_hashx)
{
void *next;
+ int i;
var_entries *var_hash = var_hashx->first;
while (var_hash) {
@@ -100,6 +125,17 @@
efree(var_hash);
var_hash = next;
}
+
+ var_hash = var_hashx->first_dtor;
+
+ while (var_hash) {
+ for (i = 0; i < var_hash->used_slots; i++) {
+ zval_ptr_dtor(&var_hash->data[i]);
+ }
+ next = var_hash->next;
+ efree(var_hash);
+ var_hash = next;
+ }
}
/* }}} */
@@ -205,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.11.4.8&r2=1.11.4.9&ty=u
Index: php-src/ext/standard/var_unserializer.re
diff -u php-src/ext/standard/var_unserializer.re:1.11.4.8
php-src/ext/standard/var_unserializer.re:1.11.4.9
--- php-src/ext/standard/var_unserializer.re:1.11.4.8 Fri Dec 3 11:09:19 2004
+++ php-src/ext/standard/var_unserializer.re Sat Jan 15 13:44:29 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: var_unserializer.re,v 1.11.4.8 2004/12/03 16:09:19 sesser Exp $ */
+/* $Id: var_unserializer.re,v 1.11.4.9 2005/01/15 18:44:29 sesser Exp $ */
#include "php.h"
#include "ext/standard/php_var.h"
@@ -54,6 +54,30 @@
var_hash->data[var_hash->used_slots++] = *rval;
}
+static inline void var_push_dtor(php_unserialize_data_t *var_hashx, zval
**rval)
+{
+ var_entries *var_hash = var_hashx->first_dtor, *prev = NULL;
+
+ while (var_hash && var_hash->used_slots == VAR_ENTRIES_MAX) {
+ prev = var_hash;
+ var_hash = var_hash->next;
+ }
+
+ if (!var_hash) {
+ var_hash = emalloc(sizeof(var_entries));
+ var_hash->used_slots = 0;
+ var_hash->next = 0;
+
+ 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;
+}
+
PHPAPI void var_replace(php_unserialize_data_t *var_hashx, zval *ozval, zval
**nzval)
{
int i;
@@ -91,6 +115,7 @@
PHPAPI void var_destroy(php_unserialize_data_t *var_hashx)
{
void *next;
+ int i;
var_entries *var_hash = var_hashx->first;
while (var_hash) {
@@ -98,6 +123,17 @@
efree(var_hash);
var_hash = next;
}
+
+ var_hash = var_hashx->first_dtor;
+
+ while (var_hash) {
+ for (i = 0; i < var_hash->used_slots; i++) {
+ zval_ptr_dtor(&var_hash->data[i]);
+ }
+ next = var_hash->next;
+ efree(var_hash);
+ var_hash = next;
+ }
}
/* }}} */
@@ -208,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
