Merge branch 'PHP-7.3' into PHP-7.4

cmb69 · cmb69 · commit 318757551a62 · 2020-03-02T11:38:03.000+01:00
* PHP-7.3:
  Fix #79333: com_print_typeinfo() leaks memory
diff --git 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
@@ -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);
 		}

Original file line number	Diff line number	Diff line change
`@@ -626,8 +626,8 @@ int php_com_process_typeinfo(ITypeInfo typeinfo, HashTable id_to_name, int pri`
`626`	`626`	`ZVAL_STRINGL(&tmp, ansiname, ansinamelen);`
`627`	`627`	`zend_hash_index_update(id_to_name, func->memid, &tmp);`
`628`	`628`	`// TODO: avoid reallocation???`
`629`		`- efree(ansiname);`
`630`	`629`	`}`
	`630`	`+ efree(ansiname);`
`631`	`631`	`}`
`632`	`632`	`ITypeInfo_ReleaseFuncDesc(typeinfo, func);`
`633`	`633`	`}`