1
0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00

Merge branch 'PHP-8.3' into PHP-8.4

* PHP-8.3:
  Fix signed int overflow in scanner
This commit is contained in:
Ilija Tovilo
2025-08-22 16:26:30 +02:00
2 changed files with 3 additions and 1 deletions

2
NEWS
View File

@@ -5,6 +5,8 @@ PHP NEWS
- Core:
. Fixed bug GH-18850 (Repeated inclusion of file with __halt_compiler()
triggers "Constant already defined" warning). (ilutov)
. Partially fixed bug GH-19542 (Scanning of string literals >=2GB will fail
due to signed int overflow). (ilutov)
- Opcache:
. Fixed bug GH-19493 (JIT variable not stored before YIELD). (Arnaud)

View File

@@ -911,7 +911,7 @@ ZEND_API void zend_multibyte_yyinput_again(zend_encoding_filter old_input_filter
ZVAL_STRINGL(zendlval, yytext, yyleng); \
}
static zend_result zend_scan_escape_string(zval *zendlval, char *str, int len, char quote_type)
static zend_result zend_scan_escape_string(zval *zendlval, char *str, size_t len, char quote_type)
{
char *s, *t;
char *end;