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.2' into PHP-8.3

Browse Source 
* PHP-8.2:
  Fix incorrect charset length in check_mb_eucjpms()
This commit is contained in:
Niels Dossche
2024-03-22 11:32:15 +01:00
parent 2b7917391c 8ffac997aa
commit 67ce1d859d
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@@ -26,6 +26,7 @@ PHP NEWS
- MySQLnd:
. Fix GH-13452 (Fixed handshake response [mysqlnd]). (Saki Takamachi)
. Fix incorrect charset length in check_mb_eucjpms(). (nielsdos)
- Opcache:
. Fixed GH-13508 (JITed QM_ASSIGN may be optimized out when op1 is null).

2
ext/mysqlnd/mysqlnd_charset.c
View File

@@ -270,7 +270,7 @@ static unsigned int check_mb_eucjpms(const char * const start, const char * cons
}
if (valid_eucjpms_ss3(start[0]) && (end - start) > 2 && valid_eucjpms(start[1]) &&
valid_eucjpms(start[2])) {
return 2;
return 3;
}
return 0;
}