feedback

Author: devnexen

ext/intl/formatter/formatter_parse.cpp

@@ -27,6 +27,7 @@ extern "C" {
 }
 
 #include <locale.h>
+#include <memory>
 
 #define ICU_LOCALE_BUG 1
 
@@ -159,10 +160,9 @@ U_CFUNC PHP_FUNCTION( numfmt_parse_currency )
 	}
 
 	icu::ParsePosition pp(position);
-	icu::CurrencyAmount *currAmt = FORMATTER_OBJECT(nfo)->parseCurrency(ustr, pp);
+	std::unique_ptr<icu::CurrencyAmount> currAmt(FORMATTER_OBJECT(nfo)->parseCurrency(ustr, pp));
 
 	if (currAmt == nullptr || pp.getErrorIndex() >= 0) {
-		delete currAmt;
 		INTL_DATA_ERROR_CODE(nfo) = U_PARSE_ERROR;
 		INTL_METHOD_CHECK_STATUS( nfo, "Number parsing failed" );
 	}
@@ -175,7 +175,6 @@ U_CFUNC PHP_FUNCTION( numfmt_parse_currency )
 
 	/* Convert parsed currency to UTF-8 and pass it back to caller. */
 	icu::UnicodeString ucurrency(currAmt->getISOCurrency());
-	delete currAmt;
 
 	zend_string *u8str = intl_charFromString(ucurrency, &INTL_DATA_ERROR_CODE(nfo));
 	INTL_METHOD_CHECK_STATUS( nfo, "Currency conversion to UTF-8 failed" );

ext/intl/listformatter/listformatter_class.cpp

@@ -26,6 +26,8 @@ extern "C" {
 #include "listformatter_class.h"
 #include "listformatter_arginfo.h"
 
+#include <memory>
+
 static zend_object_handlers listformatter_handlers;
 
 static void listformatter_free_obj(zend_object *object)
@@ -134,7 +136,7 @@ PHP_METHOD(IntlListFormatter, format)
         RETURN_EMPTY_STRING();
     }
 
-    UnicodeString *items = new UnicodeString[count];
+    std::unique_ptr<UnicodeString[]> items(new UnicodeString[count]);
     uint32_t i = 0;
     zval *val;
 
@@ -144,14 +146,12 @@ PHP_METHOD(IntlListFormatter, format)
 
         str_val = zval_try_get_tmp_string(val, &tmp_str);
         if (UNEXPECTED(!str_val)) {
-            delete[] items;
             RETURN_THROWS();
         }
         intl_stringFromChar(items[i], ZSTR_VAL(str_val), ZSTR_LEN(str_val), &conv_status);
         zend_tmp_string_release(tmp_str);
 
         if (U_FAILURE(conv_status)) {
-            delete[] items;
             intl_error_set(nullptr, conv_status, "Failed to convert string to UTF-16");
             RETURN_FALSE;
         }
@@ -162,8 +162,7 @@ PHP_METHOD(IntlListFormatter, format)
     UErrorCode status = U_ZERO_ERROR;
     UnicodeString result;
 
-    LISTFORMATTER_OBJECT(obj)->format(items, count, result, status);
-    delete[] items;
+    LISTFORMATTER_OBJECT(obj)->format(items.get(), count, result, status);
 
     if (U_FAILURE(status)) {
         intl_error_set(nullptr, status, "Failed to format list");