com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/wddx/wddx.c
| From: | Anatol Belski | Date: | Tue, 08 Nov 2016 12:03:27 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/wddx/wddx.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-95447@lists.php.net to get a copy of this message | ||
Commit: 521838cf6d8ed32c1b95553bf20d4a1318f2d044
Author: Anatol Belski <ab@php.net> Tue, 8 Nov 2016 12:16:39 +0100
Parents: 35df4b1ae3cc9a3df4e99565037cee204280332e
Branches: PHP-7.0.13
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=521838cf6d8ed32c1b95553bf20d4a1318f2d044
Log:
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix memory leak
(cherry picked from commit e87daf363b5eb2965a2cb4dec5427a9b83ce88e2)
Changed paths:
M ext/wddx/wddx.c
Diff:
diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c
index e21d178..b188e89 100644
--- 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 {