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

Closes phpGH-16713
nielsdos · Nov 10, 2024 · 1b379f5 · 1b379f5
1 parent fc8f30d
commit 1b379f5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/NEWS b/NEWS
@@ -11,6 +11,9 @@ PHP                                                                        NEWS
 - FPM:
   . Fixed GH-16432 (PHP-FPM 8.2 SIGSEGV in fpm_get_status). (Jakub Zelenka)
 
+- Hash:
+  . Fixed GH-16711: Segfault in mhash(). (Girgias)
+
 - OpenSSL:
   . Prevent unexpected array entry conversion when reading key. (nielsdos)
   . Fix various memory leaks related to openssl exports. (nielsdos)

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)