php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.4'

Browse Source
This commit is contained in:
David Carlier
2024-10-03 12:49:42 +01:00
parent 3e9f2fa071 f5d4781ee0
commit 95fa39dce8
2 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ext/pcre/php_pcre.c
View File

@@ -1124,6 +1124,11 @@ static void php_do_pcre_match(INTERNAL_FUNCTION_PARAMETERS, bool global) /* {{{
RETURN_FALSE;
}
if (start_offset == ZEND_LONG_MIN) {
zend_argument_value_error(5, "must be greater than " ZEND_LONG_FMT, ZEND_LONG_MIN);
RETURN_THROWS();
}
pce->refcount++;
php_pcre_match_impl(pce, subject, return_value, subpats,
global, flags, start_offset);

19
ext/pcre/tests/gh16189.phpt Normal file
View File

@@ -0,0 +1,19 @@
--TEST--
GH-16189 (preg_match/preg_match_all underflow on start_offset argument)
--FILE--
<?php
try {
preg_match( '/<(\w+)[\s\w\-]+ id="S44_i89ew">/', '<br><div id="S44_i89ew">', $matches, 0, PHP_INT_MIN);
} catch (\ValueError $e) {
echo $e->getMessage() . PHP_EOL;
}
try {
preg_match_all( '/<(\w+)[\s\w\-]+ id="S44_i89ew">/', '<br><div id="S44_i89ew">', $matches, 0, PHP_INT_MIN);
} catch (\ValueError $e) {
echo $e->getMessage() . PHP_EOL;
}
?>
--EXPECTF--
preg_match(): Argument #5 ($offset) must be greater than %s
preg_match_all(): Argument #5 ($offset) must be greater than %s