diff options
author | Christoph M. Becker <cmbecker69@gmx.de> | 2018-08-22 13:50:46 +0200 |
---|---|---|
committer | Christoph M. Becker <cmbecker69@gmx.de> | 2018-08-22 13:51:16 +0200 |
commit | 1de17428f671b6a5ca0495655a597a58b79517a5 (patch) | |
tree | daf2fa0caf59d7de4bd21ef926b1cdca0e0aaf83 /ext/standard/array.c | |
parent | dd07f17f9788e14d2a7db795fd7152ad3164a3f2 (diff) | |
parent | cdd9eb8c4af41c17f37d605054508c2ed9fe8004 (diff) | |
download | php-git-1de17428f671b6a5ca0495655a597a58b79517a5.tar.gz |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #76778: array_reduce leaks memory if callback throws exception
Diffstat (limited to 'ext/standard/array.c')
-rw-r--r-- | ext/standard/array.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c index 1049ec1fce..8ada2c4d8f 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -5994,6 +5994,7 @@ PHP_FUNCTION(array_reduce) } else { zval_ptr_dtor(&args[1]); zval_ptr_dtor(&args[0]); + zval_ptr_dtor(&result); return; } } ZEND_HASH_FOREACH_END(); |