Merge branch 'PHP-8.2' into PHP-8.3

ndossche · ndossche · commit 67ce1d859df8 · 2024-03-22T11:32:15.000+01:00
* PHP-8.2:
  Fix incorrect charset length in check_mb_eucjpms()
diff --git a/NEWS b/NEWS
@@ -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).
diff --git a/ext/mysqlnd/mysqlnd_charset.c b/ext/mysqlnd/mysqlnd_charset.c
@@ -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;
 }

Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ static unsigned int check_mb_eucjpms(const char * const start, const char * cons`
`270`	`270`	`}`
`271`	`271`	`if (valid_eucjpms_ss3(start[0]) && (end - start) > 2 && valid_eucjpms(start[1]) &&`
`272`	`272`	`valid_eucjpms(start[2])) {`
`273`		`- return 2;`
	`273`	`+ return 3;`
`274`	`274`	`}`
`275`	`275`	`return 0;`
`276`	`276`	`}`