Fix ToString bug

Second ToString call malfunctioning

Change-Id: Idae716e20ba01b61c1b04bd61ad5bf9e63be285d
Signed-off-by: hyunho <hhstark.kang@samsung.com>

diff --git a/watchface-complication/complication-bundle.cc b/watchface-complication/complication-bundle.cc
index 58033b8..d52a0d7 100644 (file)
--- a/watchface-complication/complication-bundle.cc
+++ b/watchface-complication/complication-bundle.cc
@@ -88,8 +88,10 @@ const char* Bundle::ToString() {
   int str_len = 0;
   bundle_raw* temp;
 
-  if (str_raw_ != NULL)
-    return str_raw_;
+  if (str_raw_ != nullptr) {
+    free(str_raw_);
+    str_raw_ = nullptr;
+  }
 
   if (bundle_encode(raw_, &temp, &str_len) != BUNDLE_ERROR_NONE)
     THROW(WATCHFACE_COMPLICATION_ERROR_OUT_OF_MEMORY);
@@ -101,8 +103,8 @@ const char* Bundle::ToString() {
 Bundle::~Bundle() {
   bundle_free(raw_);
   free(str_raw_);
-  str_raw_ = NULL;
-  raw_ = NULL;
+  str_raw_ = nullptr;
+  raw_ = nullptr;
 }
 
 }  // namespace watchface_complication