archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.2' into PHP-8.3

Browse source 
* PHP-8.2:
  ext/hash: Fix GH-16711: Segfault in mhash()
  ext/hash: Add failing tests for GH-16711
This commit is contained in:
Gina Peter Banyard 2024-11-10 20:16:14 +00:00
commit f01bafc340
No known key found for this signature in database
GPG key ID: 3306078E3194AEBD
4 changed files with 203 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
NEWS
View file

@ -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)

4
ext/hash/hash.c
View file

@ -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) {

98
ext/hash/tests/gh16711_1.phpt Normal file
View file

@ -0,0 +1,98 @@
--TEST--
GH-16711: Segmentation fault in mhash()
--SKIPIF--
<?php if(!function_exists('mhash')) { die('skip mhash compatibility layer not available'); } ?>
--FILE--
<?php
$re = new ReflectionExtension("hash");
var_dump($re->getConstants());
var_dump(mhash(133, 1086849124, 133));
?>
--EXPECTF--
array(40) {
["HASH_HMAC"]=>
int(1)
["MHASH_CRC32"]=>
int(0)
["MHASH_MD5"]=>
int(1)
["MHASH_SHA1"]=>
int(2)
["MHASH_HAVAL256"]=>
int(3)
["MHASH_RIPEMD160"]=>
int(5)
["MHASH_TIGER"]=>
int(7)
["MHASH_GOST"]=>
int(8)
["MHASH_CRC32B"]=>
int(9)
["MHASH_HAVAL224"]=>
int(10)
["MHASH_HAVAL192"]=>
int(11)
["MHASH_HAVAL160"]=>
int(12)
["MHASH_HAVAL128"]=>
int(13)
["MHASH_TIGER128"]=>
int(14)
["MHASH_TIGER160"]=>
int(15)
["MHASH_MD4"]=>
int(16)
["MHASH_SHA256"]=>
int(17)
["MHASH_ADLER32"]=>
int(18)
["MHASH_SHA224"]=>
int(19)
["MHASH_SHA512"]=>
int(20)
["MHASH_SHA384"]=>
int(21)
["MHASH_WHIRLPOOL"]=>
int(22)
["MHASH_RIPEMD128"]=>
int(23)
["MHASH_RIPEMD256"]=>
int(24)
["MHASH_RIPEMD320"]=>
int(25)
["MHASH_SNEFRU256"]=>
int(27)
["MHASH_MD2"]=>
int(28)
["MHASH_FNV132"]=>
int(29)
["MHASH_FNV1A32"]=>
int(30)
["MHASH_FNV164"]=>
int(31)
["MHASH_FNV1A64"]=>
int(32)
["MHASH_JOAAT"]=>
int(33)
["MHASH_CRC32C"]=>
int(34)
["MHASH_MURMUR3A"]=>
int(35)
["MHASH_MURMUR3C"]=>
int(36)
["MHASH_MURMUR3F"]=>
int(37)
["MHASH_XXH32"]=>
int(38)
["MHASH_XXH64"]=>
int(39)
["MHASH_XXH3"]=>
int(40)
["MHASH_XXH128"]=>
int(41)
}
Deprecated: Function mhash() is deprecated in %s on line %d
bool(false)

98
ext/hash/tests/gh16711_2.phpt Normal file
View file

@ -0,0 +1,98 @@
--TEST--
GH-16711: Segmentation fault in mhash()
--SKIPIF--
<?php if(!function_exists('mhash')) { die('skip mhash compatibility layer not available'); } ?>
--FILE--
<?php
$re = new ReflectionExtension("hash");
var_dump($re->getConstants());
var_dump(mhash(4, 1086849124, 133));
?>
--EXPECTF--
array(40) {
["HASH_HMAC"]=>
int(1)
["MHASH_CRC32"]=>
int(0)
["MHASH_MD5"]=>
int(1)
["MHASH_SHA1"]=>
int(2)
["MHASH_HAVAL256"]=>
int(3)
["MHASH_RIPEMD160"]=>
int(5)
["MHASH_TIGER"]=>
int(7)
["MHASH_GOST"]=>
int(8)
["MHASH_CRC32B"]=>
int(9)
["MHASH_HAVAL224"]=>
int(10)
["MHASH_HAVAL192"]=>
int(11)
["MHASH_HAVAL160"]=>
int(12)
["MHASH_HAVAL128"]=>
int(13)
["MHASH_TIGER128"]=>
int(14)
["MHASH_TIGER160"]=>
int(15)
["MHASH_MD4"]=>
int(16)
["MHASH_SHA256"]=>
int(17)
["MHASH_ADLER32"]=>
int(18)
["MHASH_SHA224"]=>
int(19)
["MHASH_SHA512"]=>
int(20)
["MHASH_SHA384"]=>
int(21)
["MHASH_WHIRLPOOL"]=>
int(22)
["MHASH_RIPEMD128"]=>
int(23)
["MHASH_RIPEMD256"]=>
int(24)
["MHASH_RIPEMD320"]=>
int(25)
["MHASH_SNEFRU256"]=>
int(27)
["MHASH_MD2"]=>
int(28)
["MHASH_FNV132"]=>
int(29)
["MHASH_FNV1A32"]=>
int(30)
["MHASH_FNV164"]=>
int(31)
["MHASH_FNV1A64"]=>
int(32)
["MHASH_JOAAT"]=>
int(33)
["MHASH_CRC32C"]=>
int(34)
["MHASH_MURMUR3A"]=>
int(35)
["MHASH_MURMUR3C"]=>
int(36)
["MHASH_MURMUR3F"]=>
int(37)
["MHASH_XXH32"]=>
int(38)
["MHASH_XXH64"]=>
int(39)
["MHASH_XXH3"]=>
int(40)
["MHASH_XXH128"]=>
int(41)
}
Deprecated: Function mhash() is deprecated in %s on line %d
bool(false)