Merge branch 'PHP-7.4'

cmb69 · cmb69 · commit c987e538ac18 · 2020-03-02T11:38:50.000+01:00
* PHP-7.4:
  Fix #79333: com_print_typeinfo() leaks memory
diff --git a/ext/com_dotnet/com_typeinfo.c b/ext/com_dotnet/com_typeinfo.c
@@ -624,8 +624,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
`@@ -624,8 +624,8 @@ int php_com_process_typeinfo(ITypeInfo typeinfo, HashTable id_to_name, int pri`
`624`	`624`	`ZVAL_STRINGL(&tmp, ansiname, ansinamelen);`
`625`	`625`	`zend_hash_index_update(id_to_name, func->memid, &tmp);`
`626`	`626`	`// TODO: avoid reallocation???`
`627`		`- efree(ansiname);`
`628`	`627`	`}`
	`628`	`+ efree(ansiname);`
`629`	`629`	`}`
`630`	`630`	`ITypeInfo_ReleaseFuncDesc(typeinfo, func);`
`631`	`631`	`}`