ext/intl: Use zval_get_tmp_string where possible

Author: nielsdos

ext/intl/collator/collator_convert.c

@@ -332,9 +332,10 @@ zend_string *collator_zval_to_string(zval *arg)
 		return zend_string_copy(Z_STR_P(arg));
 	}
 
-	zend_string *utf8_str = zval_get_string(arg);
+	zend_string *tmp_str;
+	zend_string *utf8_str = zval_get_tmp_string(arg, &tmp_str);
 	zend_string *utf16_str = collator_convert_zstr_utf8_to_utf16(utf8_str);
-	zend_string_release(utf8_str);
+	zend_tmp_string_release(tmp_str);
 	return utf16_str;
 }
 

ext/intl/listformatter/listformatter_class.c

@@ -135,17 +135,17 @@ PHP_METHOD(IntlListFormatter, format)
     zval *val;
 
     ZEND_HASH_FOREACH_VAL(ht, val) {
-        zend_string *str_val;
+        zend_string *str_val, *tmp_str;
 
-        str_val = zval_get_string(val);
+        str_val = zval_get_tmp_string(val, &tmp_str);
 
         // Convert PHP string to UTF-16
         UChar *ustr = NULL;
         int32_t ustr_len = 0;
         UErrorCode status = U_ZERO_ERROR;
 
         intl_convert_utf8_to_utf16(&ustr, &ustr_len, ZSTR_VAL(str_val), ZSTR_LEN(str_val), &status);
-        zend_string_release(str_val);
+        zend_tmp_string_release(tmp_str);
 
         if (U_FAILURE(status)) {
             // We can't use goto cleanup because items and itemLengths are incompletely allocated