Merge branch 'PHP-8.3'

nielsdos · nielsdos · commit b9bb8d62cae8 · 2024-03-22T11:32:23.000+01:00
* PHP-8.3:
  Fix incorrect charset length in check_mb_eucjpms()
diff --git a/ext/mysqlnd/mysqlnd_charset.c b/ext/mysqlnd/mysqlnd_charset.c
@@ -331,7 +331,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
`@@ -331,7 +331,7 @@ static unsigned int check_mb_eucjpms(const char * const start, const char * cons`
`331`	`331`	`}`
`332`	`332`	`if (valid_eucjpms_ss3(start[0]) && (end - start) > 2 && valid_eucjpms(start[1]) &&`
`333`	`333`	`valid_eucjpms(start[2])) {`
`334`		`- return 2;`
	`334`	`+ return 3;`
`335`	`335`	`}`
`336`	`336`	`return 0;`
`337`	`337`	`}`