ext/intl: fix bug introduced by 5455c3f

devnexen · devnexen · commit 96ffe6ad7e8b · 2024-01-03T17:33:27.000Z
was meant to fix GH-12943. Close GH-13001.
diff --git a/ext/intl/dateformat/dateformat_create.cpp b/ext/intl/dateformat/dateformat_create.cpp
@@ -112,7 +112,7 @@ static zend_result datefmt_ctor(INTERNAL_FUNCTION_PARAMETERS, zend_error_handlin
 	}
 	locale = Locale::createFromName(locale_str);
 	/* get*Name accessors being set does not preclude being bogus */
-	if (locale.isBogus() || ((locale_len == 1 && locale_str[0] != 'C') && strlen(locale.getISO3Language()) == 0)) {
+	if (locale.isBogus() || ((locale_len == 1 && locale_str[0] != 'C') || (locale_len > 1 && strlen(locale.getISO3Language()) == 0))) {
 		goto error;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ static zend_result datefmt_ctor(INTERNAL_FUNCTION_PARAMETERS, zend_error_handlin`
`112`	`112`	`}`
`113`	`113`	`locale = Locale::createFromName(locale_str);`
`114`	`114`	`/* getName accessors being set does not preclude being bogus /`
`115`		`- if (locale.isBogus() \|\| ((locale_len == 1 && locale_str[0] != 'C') && strlen(locale.getISO3Language()) == 0)) {`
	`115`	`+ if (locale.isBogus() \|\| ((locale_len == 1 && locale_str[0] != 'C') \|\| (locale_len > 1 && strlen(locale.getISO3Language()) == 0))) {`
`116`	`116`	`goto error;`
`117`	`117`	`}`
`118`	`118`