ext/intl: intl_CharFromString using zend_string_truncate to adjust th… (php#11575)

devnexen · web-flow · commit 44fa68b06411 · 2023-07-03T16:41:20.000+01:00
* ext/intl: intl_CharFromString using zend_string_truncate to adjust the size of the buffer.
diff --git a/ext/intl/intl_convertcpp.cpp b/ext/intl/intl_convertcpp.cpp
@@ -79,8 +79,7 @@ zend_string* intl_charFromString(const UnicodeString &from, UErrorCode *status)
 		zend_string_free(u8res);
 		return NULL;
 	}
-	ZSTR_VAL(u8res)[actual_len] = '\0';
-	ZSTR_LEN(u8res) = actual_len;
+	u8res = zend_string_truncate(u8res, actual_len, 0);
 
 	return u8res;
 }

Original file line number	Diff line number	Diff line change
`@@ -79,8 +79,7 @@ zend_string* intl_charFromString(const UnicodeString &from, UErrorCode *status)`
`79`	`79`	`zend_string_free(u8res);`
`80`	`80`	`return NULL;`
`81`	`81`	`}`
`82`		`- ZSTR_VAL(u8res)[actual_len] = '\0';`
`83`		`- ZSTR_LEN(u8res) = actual_len;`
	`82`	`+ u8res = zend_string_truncate(u8res, actual_len, 0);`
`84`	`83`
`85`	`84`	`return u8res;`
`86`	`85`	`}`