Changeset 358

Timestamp:

07/14/09 15:09:00 (1 year ago)

Author:

bart

Message:

Fix a heap corruption bug

Files:

• eaccelerator/trunk/ea_restore.c (modified) (3 diffs)
• eaccelerator/trunk/ea_store.c (modified) (2 diffs)
• eaccelerator/trunk/eaccelerator.h (modified) (1 diff)

eaccelerator/trunk/ea_restore.c

@@ -128 +128 @@
-void fixup_zval(char *base, zval * zv TSRMLS_DC)
-{
-Z_TYPE_P(zv) & ~IS_CONSTANT_INDEX
+EA_ZV_TYPE_P(zv)
-        case IS_CONSTANT:           /* fallthrough */
-        case IS_OBJECT:             /* fallthrough: object are serialized */
@@ -352 +352 @@
-void restore_zval(zval * zv TSRMLS_DC)
-{
-zv->type & ~IS_CONSTANT_INDEX
+EA_ZV_TYPE_P(zv)
-    case IS_CONSTANT:
-    case IS_OBJECT:
@@ -730 +730 @@
-    restore_zval_hash(&to->constants_table, &from->constants_table);
-    to->constants_table.pDestructor = ZVAL_PTR_DTOR;
+    
+    /* restore properties */
+    restore_hash(&to->properties_info, &from->properties_info, (restore_bucket_t) restore_property_info TSRMLS_CC);
+    to->properties_info.pDestructor = properties_info_dtor;
+
-    /* restore default properties */
-    restore_zval_hash(&to->default_properties, &from->default_properties);
-    to->default_properties.pDestructor = ZVAL_PTR_DTOR;
-    /* restore properties */
-    restore_hash(&to->properties_info, &from->properties_info, (restore_bucket_t) restore_property_info TSRMLS_CC);
-    to->properties_info.pDestructor = properties_info_dtor;
-
-    /* restore default_static_members */

eaccelerator/trunk/ea_store.c

@@ -125 +125 @@
-    size_t size = 0;
-
-Z_TYPE_P(zv) & ~IS_CONSTANT_INDEX
+EA_ZV_TYPE_P(zv)
-        case IS_CONSTANT:
-        case IS_OBJECT: /* object should have been serialized before storing them */
@@ -453 +453 @@
-void store_zval(char **at, zval *zv TSRMLS_DC)
-{
-Z_TYPE_P(zv) & ~IS_CONSTANT_INDEX
+EA_ZV_TYPE_P(zv)
-        case IS_CONSTANT:
-        case IS_OBJECT: /* object should have been serialized before storing them */

eaccelerator/trunk/eaccelerator.h

@@ -196 +196 @@
-/******************************************************************************/
-
+/* get the type of the zvalue */
+#ifdef ZEND_ENGINE_2_3
+#   define EA_ZV_TYPE_P(zv) (Z_TYPE_P(zv) & IS_CONSTANT_TYPE_MASK)
+#else
+#   define EA_ZV_TYPE_P(zv) (Z_TYPE_P(zv) & ~IS_CONSTANT_INDEX)
+#endif
+
-
-#ifndef offsetof