fix leak, take on 5.6

weltling · weltling · commit b04d60626de2 · 2016-12-06T14:34:27.000+01:00
diff --git a/ext/wddx/tests/bug73631.phpt b/ext/wddx/tests/bug73631.phpt
@@ -2,8 +2,6 @@
 Bug #73631 (Memory leak due to invalid wddx stack processing)
 --SKIPIF--
 <?php if (!extension_loaded("wddx")) print "skip"; ?>
---XFAIL--
-Still has memory leaks, not sure how to fix them.
 --FILE--
 <?php
 $xml = <<<EOF
diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c
@@ -1057,6 +1057,8 @@ static void php_wddx_pop_element(void *user_data, const XML_Char *name)
 				} else	{
 					zend_hash_next_index_insert(target_hash, &ent1->data, sizeof(zval *), NULL);
 				}
+			} else if (!strcmp(name, EL_BINARY) && STR_EMPTY_ALLOC() == Z_STRVAL_P(ent1->data)) {
+				zval_ptr_dtor(&ent1->data);
 			}
 			efree(ent1);
 		} else {

Original file line number	Diff line number	Diff line change
`@@ -1057,6 +1057,8 @@ static void php_wddx_pop_element(void user_data, const XML_Char name)`
`1057`	`1057`	`} else {`
`1058`	`1058`	`zend_hash_next_index_insert(target_hash, &ent1->data, sizeof(zval *), NULL);`
`1059`	`1059`	`}`
	`1060`	`+ } else if (!strcmp(name, EL_BINARY) && STR_EMPTY_ALLOC() == Z_STRVAL_P(ent1->data)) {`
	`1061`	`+ zval_ptr_dtor(&ent1->data);`
`1060`	`1062`	`}`
`1061`	`1063`	`efree(ent1);`
`1062`	`1064`	`} else {`