Merge branch 'PHP-5.6' into PHP-7.0

weltling · weltling · commit e87daf363b5e · 2016-11-08T12:16:39.000+01:00
* PHP-5.6:
  fix memory leak
diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c
@@ -952,6 +952,7 @@ static void php_wddx_pop_element(void *user_data, const XML_Char *name)
 						}
 
 						if (pce != PHP_IC_ENTRY && (pce->serialize || pce->unserialize)) {
+							zval_ptr_dtor(&ent2->data);
 							ZVAL_UNDEF(&ent2->data);
 							php_error_docref(NULL, E_WARNING, "Class %s can not be unserialized", Z_STRVAL(ent1->data));
 						} else {

Original file line number	Diff line number	Diff line change
`@@ -952,6 +952,7 @@ static void php_wddx_pop_element(void user_data, const XML_Char name)`
`952`	`952`	`}`
`953`	`953`
`954`	`954`	`if (pce != PHP_IC_ENTRY && (pce->serialize \|\| pce->unserialize)) {`
	`955`	`+ zval_ptr_dtor(&ent2->data);`
`955`	`956`	`ZVAL_UNDEF(&ent2->data);`
`956`	`957`	`php_error_docref(NULL, E_WARNING, "Class %s can not be unserialized", Z_STRVAL(ent1->data));`
`957`	`958`	`} else {`