ext/hash: Fix GH-16711: Segfault in mhash()

Girgias · Girgias · commit 7fa674bf47cb · 2024-11-06T17:21:57.000Z
diff --git a/ext/hash/hash.c b/ext/hash/hash.c
@@ -1213,7 +1213,11 @@ PHP_FUNCTION(mhash)
 		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), 0);
+		} else {
+			RETURN_FALSE;
 		}
+	} else {
+		RETURN_FALSE;
 	}
 
 	if (key) {
diff --git a/ext/hash/tests/gh16711_1.phpt b/ext/hash/tests/gh16711_1.phpt
@@ -2,8 +2,6 @@
 GH-16711: Segmentation fault in mhash()
 --SKIPIF--
 <?php if(!function_exists('mhash')) { die('skip mhash compatibility layer not available'); } ?>
---XFAIL--
-SEGFAULT
 --FILE--
 <?php
 
@@ -97,4 +95,4 @@ array(40) {
 }
 
 Deprecated: Function mhash() is deprecated in %s on line %d
-SEGFAULT
+bool(false)
diff --git a/ext/hash/tests/gh16711_2.phpt b/ext/hash/tests/gh16711_2.phpt
@@ -2,8 +2,6 @@
 GH-16711: Segmentation fault in mhash()
 --SKIPIF--
 <?php if(!function_exists('mhash')) { die('skip mhash compatibility layer not available'); } ?>
---XFAIL--
-SEGFAULT
 --FILE--
 <?php
 
@@ -97,4 +95,4 @@ array(40) {
 }
 
 Deprecated: Function mhash() is deprecated in %s on line %d
-SEGFAULT
+bool(false)

Original file line number	Diff line number	Diff line change
`@@ -1213,7 +1213,11 @@ PHP_FUNCTION(mhash)`
`1213`	`1213`	`struct mhash_bc_entry algorithm_lookup = mhash_to_hash[algorithm];`
`1214`	`1214`	`if (algorithm_lookup.hash_name) {`
`1215`	`1215`	`algo = zend_string_init(algorithm_lookup.hash_name, strlen(algorithm_lookup.hash_name), 0);`
	`1216`	`+ } else {`
	`1217`	`+ RETURN_FALSE;`
`1216`	`1218`	`}`
	`1219`	`+ } else {`
	`1220`	`+ RETURN_FALSE;`
`1217`	`1221`	`}`
`1218`	`1222`
`1219`	`1223`	`if (key) {`