Update ext/mbstring/libmbfl/mbfl/mbfl_encoding.c

youkidearitai · ndossche · web-flow · commit 21970ab911b0 · 2024-09-10T14:06:58.000-07:00
Co-authored-by: Niels Dossche &lt;7771979+nielsdos@users.noreply.github.com&gt;
diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c b/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c
@@ -363,7 +363,7 @@ const mbfl_encoding *mbfl_name2encoding_ex(const char *name, size_t name_len)
 	for (encoding = mbfl_encoding_ptr_list; *encoding; encoding++) {
 		if ((*encoding)->aliases) {
 			for (const char **alias = (*encoding)->aliases; *alias; alias++) {
-				if (strncasecmp(name, *alias, name_len) == 0 && strlen(*alias) == name_len) {
+				if (strncasecmp(name, *alias, name_len) == 0 && (*alias)[name_len] == '\0') {
 					return *encoding;
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -363,7 +363,7 @@ const mbfl_encoding mbfl_name2encoding_ex(const char name, size_t name_len)`
`363`	`363`	`for (encoding = mbfl_encoding_ptr_list; *encoding; encoding++) {`
`364`	`364`	`if ((*encoding)->aliases) {`
`365`	`365`	`for (const char *alias = (encoding)->aliases; *alias; alias++) {`
`366`		`- if (strncasecmp(name, alias, name_len) == 0 && strlen(alias) == name_len) {`
	`366`	`+ if (strncasecmp(name, alias, name_len) == 0 && (alias)[name_len] == '\0') {`
`367`	`367`	`return *encoding;`
`368`	`368`	`}`
`369`	`369`	`}`