Fix -Werror failure in Spoofchecker::areConfusable

nielsdos · nielsdos · commit f20c1fe0eabb · 2023-03-25T22:34:41.000+01:00
diff --git a/ext/intl/spoofchecker/spoofchecker_main.c b/ext/intl/spoofchecker/spoofchecker_main.c
@@ -78,6 +78,8 @@ PHP_METHOD(Spoofchecker, areConfusable)
 	SPOOFCHECKER_METHOD_FETCH_OBJECT;
 	if(s1_len > INT32_MAX || s2_len > INT32_MAX) {
 		SPOOFCHECKER_ERROR_CODE(co) = U_BUFFER_OVERFLOW_ERROR;
+		/* Work around compiler uninitialised warning, which breaks -Werror builds */
+		ret = 1;
 	} else {
 		ret = uspoof_areConfusableUTF8(co->uspoof, s1, (int32_t)s1_len, s2, (int32_t)s2_len, SPOOFCHECKER_ERROR_CODE_P(co));
 	}

Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,8 @@ PHP_METHOD(Spoofchecker, areConfusable)`
`78`	`78`	`SPOOFCHECKER_METHOD_FETCH_OBJECT;`
`79`	`79`	`if(s1_len > INT32_MAX \|\| s2_len > INT32_MAX) {`
`80`	`80`	`SPOOFCHECKER_ERROR_CODE(co) = U_BUFFER_OVERFLOW_ERROR;`
	`81`	`+ /* Work around compiler uninitialised warning, which breaks -Werror builds */`
	`82`	`+ ret = 1;`
`81`	`83`	`} else {`
`82`	`84`	`ret = uspoof_areConfusableUTF8(co->uspoof, s1, (int32_t)s1_len, s2, (int32_t)s2_len, SPOOFCHECKER_ERROR_CODE_P(co));`
`83`	`85`	`}`