Changeset 1576 in svn

Timestamp:

2014-11-12T18:55:52Z (4 years ago)

Author:

Xuefer

Message:

fix some xcache_get leak by refcount

Location:

trunk

Files:

• processor/foot.m4 (modified) (2 diffs)
• processor/processor.m4 (modified) (5 diffs)
• tests/xcache_var_object.phpt (modified) (1 diff)
• tests/xcache_var_object_5.1.phpt (added)
• tests/xcache_var_reference.phpt (modified) (1 diff)
• tests/xcache_var_reference_4.phpt (added)
• tests/xcache_var_reference_5.1.phpt (added)

trunk/processor/foot.m4

@@ -125 +125 @@
     if (processor.handle_reference) {
         zend_hash_init(&processor.zvalptrs, 0, NULL, NULL, 0);
-        if (dst_ptr) {
-            zval_ptr_dtor(dst_ptr);
-        }
     }
     processor.index_to_ce = index_to_ce;
@@ -145 +142 @@
     }
 #endif
+    zval_ptr_dtor(&dst);
     if (dst_ptr) {
         xc_restore_zval_ptr(&processor, dst_ptr, &src->value TSRMLS_CC);
+        Z_ADDREF(**dst_ptr);
     }
     else {
         xc_restore_zval(&processor, dst, src->value TSRMLS_CC);
+        Z_ADDREF(*dst);
     }
     if (processor.handle_reference) {

trunk/processor/processor.m4

@@ -307 +307 @@
                     ')
                     if (zend_hash_add(&processor->zvalptrs, (char *) &SRC()[0], sizeof(SRC()[0]), (void *) &pzv, sizeof(pzv), NULL) == SUCCESS) { /* first add, go on */
-                        IFSTORE(`Z_SET_REFCOUNT(**DST(), 1);')
                         dnl IFSTORE(`fprintf(stderr, "mark[%p] = %p\n", (void *) SRC()[0], (void *) pzv);')
                     }
@@ -320 +319 @@
             IFDPRINT(`INDENT()`'fprintf(stderr, "[%p] ", (void *) SRC()[0]);')
             STRUCT_P_EX(zval, DST()[0], SRC()[0], `[0]', `', ` ')
+            dnl don't set refcount in zval processor
+            IFSTORE(`Z_SET_REFCOUNT(**DST(), 1);')
             RELOCATE_EX(zval, DST()[0])
         } while (0);
@@ -1419 +1420 @@
     IFDPRINT(`INDENT()`'fprintf(stderr, "zval:value");')
     STRUCT_P_EX(zval_ptr, DST(`value'), SRC(`value'), `value', `', `&')
+    DONE(value)
 #if 0
     IFSTORE(`
@@ -1425 +1427 @@
         zval **zv;
 
-        assert(Z_TYPE_P(SRC(`value')) == IS_ARRAY);
-        ht = Z_ARRVAL_P(SRC(`value'));
+        assert(Z_TYPE_P(DST(`value')) == IS_ARRAY);
+        ht = Z_ARRVAL_P(DST(`value'));
         assert(ht->nNumOfElements == 1);
         fprintf(stderr, "key %s\n", ht->pListHead->arKey);
 
         zv = (zval **) ht->pListHead->pData;
-        fprintf(stderr, "%d\n", Z_TYPE_PP(zv));
         assert(Z_TYPE_PP(zv) == IS_ARRAY);
         assert(Z_ARRVAL_PP(zv) == ht);
+        fprintf(stderr, "refcount=%d\n", Z_REFCOUNT(*DST(`value')));
+        fprintf(stderr, "refcount=%d\n", Z_REFCOUNT(**zv));
     }
     ')
@@ -1483 +1486 @@
 
     PROCESS(zend_bool, have_references)
-    DONE(value)
 ')
 dnl }}}

trunk/tests/xcache_var_object.phpt

@@ -1 +1 @@
 --TEST--
-xcache_set/get test for object
+xcache_set/get test for object PHP 5.2+
 --SKIPIF--
 <?php
 require("skipif.inc");
+if (!version_compare(phpversion(), '5.2', '>=')) {
+    echo 'skip for PHP 5.2+ only';
+}
 ?>
 --INI--

trunk/tests/xcache_var_reference.phpt

@@ -1 +1 @@
 --TEST--
-xcache_set/get test for reference
+xcache_set/get test for reference for PHP 5.2+
 --SKIPIF--
 <?php
 require("skipif.inc");
+if (!version_compare(phpversion(), '5.2', '>=')) {
+    echo 'skip for PHP 5.2+ only';
+}
 ?>
 --INI--