Fix static analysis issue 83/227683/1
authorJunghoon Park <jh9216.park@samsung.com>
Sun, 15 Mar 2020 23:38:31 +0000 (08:38 +0900)
committerJunghoon Park <jh9216.park@samsung.com>
Sun, 15 Mar 2020 23:38:31 +0000 (08:38 +0900)
Change-Id: If88d70524d02415b5630970f6141681fbed07741
Signed-off-by: Junghoon Park <jh9216.park@samsung.com>
unittest/src/test-watchface-complication-provider.cc

index 77792ac..1fe0ca3 100644 (file)
@@ -137,25 +137,27 @@ void __all_provider_foreach_cb(const provider_info_h info, void *user_data) {
 }
 
 void __provider_foreach_cb(const provider_info_h info, void *user_data) {
-  char* str_value;
-  int types;
-
+  char* str_value = nullptr;
   watchface_complication_provider_info_get_id(info, &str_value);
-  EXPECT_STREQ(str_value, "org.tizen.gmock_comp_provider/test");
-  free(str_value);
+  unique_ptr<char, decltype(free)*> ptr(str_value, free);
+  EXPECT_STREQ(ptr.get(), "org.tizen.gmock_comp_provider/test");
 
+  str_value = nullptr;
   watchface_complication_provider_info_get_app_id(info, &str_value);
-  EXPECT_STREQ(str_value, "org.tizen.gmock_comp_provider");
-  free(str_value);
+  ptr.reset(str_value);
+  EXPECT_STREQ(ptr.get(), "org.tizen.gmock_comp_provider");
 
+  str_value = nullptr;
   watchface_complication_provider_info_get_label(info, &str_value);
-  EXPECT_STREQ(str_value, "provider_label");
-  free(str_value);
+  ptr.reset(str_value);
+  EXPECT_STREQ(ptr.get(), "provider_label");
 
+  str_value = nullptr;
   watchface_complication_provider_info_get_icon(info, &str_value);
-  EXPECT_STREQ(str_value, "icon_path");
-  free(str_value);
+  ptr.reset(str_value);
+  EXPECT_STREQ(ptr.get(), "icon_path");
 
+  int types;
   watchface_complication_provider_info_get_types(info, &types);
   EXPECT_EQ(WATCHFACE_COMPLICATION_TYPE_SHORT_TEXT |
                 WATCHFACE_COMPLICATION_TYPE_LONG_TEXT |
@@ -165,7 +167,6 @@ void __provider_foreach_cb(const provider_info_h info, void *user_data) {
                 WATCHFACE_COMPLICATION_TYPE_IMAGE |
                 WATCHFACE_COMPLICATION_TYPE_SMALL_IMAGE,
                 types);
-
 }
 
 class CWCP : public ::testing::Test {