Fixed memory leak (ext/hash/tests/mhash_001.phpt failure)

dstogov · dstogov · commit 736c5dca1008 · 2020-08-19T09:30:08.000+03:00
diff --git a/ext/hash/hash.c b/ext/hash/hash.c
@@ -1202,7 +1202,7 @@ PHP_FUNCTION(mhash)
 	if (algorithm >= 0 && algorithm < MHASH_NUM_ALGOS) {
 		struct mhash_bc_entry algorithm_lookup = mhash_to_hash[algorithm];
 		if (algorithm_lookup.hash_name) {
-			algo = zend_string_init(algorithm_lookup.hash_name, strlen(algorithm_lookup.hash_name), 1);
+			algo = zend_string_init(algorithm_lookup.hash_name, strlen(algorithm_lookup.hash_name), 0);
 		}
 	}
 
@@ -1211,6 +1211,10 @@ PHP_FUNCTION(mhash)
 	} else {
 		php_hash_do_hash(return_value, algo, data, data_len, 1, 0);
 	}
+
+	if (algo) {
+		zend_string_release(algo);
+	}
 }
 /* }}} */
 

Original file line number	Diff line number	Diff line change
`@@ -1202,7 +1202,7 @@ PHP_FUNCTION(mhash)`
`1202`	`1202`	`if (algorithm >= 0 && algorithm < MHASH_NUM_ALGOS) {`
`1203`	`1203`	`struct mhash_bc_entry algorithm_lookup = mhash_to_hash[algorithm];`
`1204`	`1204`	`if (algorithm_lookup.hash_name) {`
`1205`		`- algo = zend_string_init(algorithm_lookup.hash_name, strlen(algorithm_lookup.hash_name), 1);`
	`1205`	`+ algo = zend_string_init(algorithm_lookup.hash_name, strlen(algorithm_lookup.hash_name), 0);`
`1206`	`1206`	`}`
`1207`	`1207`	`}`
`1208`	`1208`
`@@ -1211,6 +1211,10 @@ PHP_FUNCTION(mhash)`
`1211`	`1211`	`} else {`
`1212`	`1212`	`php_hash_do_hash(return_value, algo, data, data_len, 1, 0);`
`1213`	`1213`	`}`
	`1214`	`+`
	`1215`	`+ if (algo) {`
	`1216`	`+ zend_string_release(algo);`
	`1217`	`+ }`
`1214`	`1218`	`}`
`1215`	`1219`	`/* }}} */`
`1216`	`1220`