From: JinWang An <jinwang.an@samsung.com>
Date: Mon, 21 Sep 2020 17:12:47 +0000 (+0900)
Subject: Add free() to fix memory leak at i18n_measure_format_format_measures
X-Git-Tag: accepted/tizen/6.0/unified/hotfix/20201103.004028
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Ftags%2Faccepted%2Ftizen%2F6.0%2Funified%2Fhotfix%2F20201103.004028;p=platform%2Fcore%2Fapi%2Fbase-utils.git

Add free() to fix memory leak at i18n_measure_format_format_measures

Change-Id: If6a39bf2776d2bbd9834ea28e190b3f534532648
Signed-off-by: JinWang An <jinwang.an@samsung.com>
---

diff --git a/src/utils_i18n_measure_format.cpp b/src/utils_i18n_measure_format.cpp
index ece211c..350ab0f 100644
--- a/src/utils_i18n_measure_format.cpp
+++ b/src/utils_i18n_measure_format.cpp
@@ -242,9 +242,18 @@ int i18n_measure_format_format_measures(const i18n_measure_format_h measure_form
 
 	const i18n_uchar *uchar_result = (i18n_uchar *)result.getTerminatedBuffer();
 
-	retv_if(uchar_result == NULL, I18N_ERROR_INVALID_PARAMETER);
+	if(uchar_result == NULL) {
+		ERR("result.getTerminatedBuffer() == NULL");
+		free(measure_array);
+		return I18N_ERROR_INVALID_PARAMETER;
+	}
+
 	*output_length = i18n_ustring_get_length(uchar_result);
-	retv_if(append_to_size < *output_length, I18N_ERROR_BUFFER_OVERFLOW);
+	if(append_to_size < *output_length) {
+		ERR("append_to_size < *output_length");
+		free(measure_array);
+		return I18N_ERROR_BUFFER_OVERFLOW;
+	}
 
 	if (*output_length > 0)
 		i18n_ustring_copy_n(append_to, uchar_result, append_to_size);