summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2020-03-02 11:37:14 +0100
committerChristoph M. Becker <cmbecker69@gmx.de>2020-03-02 11:38:03 +0100
commit318757551a62f767a956db50e7d3592d7cb07407 (patch)
treeacc098c21991adfd35c25db4f2bcf84536c16cb2
parentb9843c9418a1325c4e7dfbf678b3e221c815c130 (diff)
parent53140e5c567af6cba0779e178394404f92213713 (diff)
downloadphp-git-318757551a62f767a956db50e7d3592d7cb07407.tar.gz
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3: Fix #79333: com_print_typeinfo() leaks memory
-rw-r--r--NEWS1
-rw-r--r--ext/com_dotnet/com_typeinfo.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index da6a7c16c3..20764cc5be 100644
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,7 @@ PHP NEWS
. Fixed bug #79299 (com_print_typeinfo prints duplicate variables). (Litiano
Moura)
. Fixed bug #79332 (php_istreams are never freed). (cmb)
+ . Fixed bug #79333 (com_print_typeinfo() leaks memory). (cmb)
- CURL:
. Fixed bug #79019 (Copied cURL handles upload empty file). (cmb)
diff --git a/ext/com_dotnet/com_typeinfo.c b/ext/com_dotnet/com_typeinfo.c
index bb5f92a591..4ee73cf41f 100644
--- a/ext/com_dotnet/com_typeinfo.c
+++ b/ext/com_dotnet/com_typeinfo.c
@@ -626,8 +626,8 @@ int php_com_process_typeinfo(ITypeInfo *typeinfo, HashTable *id_to_name, int pri
ZVAL_STRINGL(&tmp, ansiname, ansinamelen);
zend_hash_index_update(id_to_name, func->memid, &tmp);
// TODO: avoid reallocation???
- efree(ansiname);
}
+ efree(ansiname);
}
ITypeInfo_ReleaseFuncDesc(typeinfo, func);
}