modules/clock: fix svace issue 20/126420/2 submit/tizen/20170421.133547
authorLukasz Stanislawski <l.stanislaws@samsung.com>
Fri, 21 Apr 2017 09:24:59 +0000 (11:24 +0200)
committerLukasz Stanislawski <l.stanislaws@samsung.com>
Fri, 21 Apr 2017 13:05:29 +0000 (15:05 +0200)
Change-Id: I5620333a49306893bb52856269512d6a70605fd4

src/modules/clock/clock.c

index 67d9139..23526bc 100644 (file)
@@ -403,7 +403,12 @@ static char *_string_replacer(const char *src, const char *pattern, const char *
 
        char *result = NULL;
        Eina_Bool ret = eina_strbuf_append(strbuf, src);
-       retvm_if(ret == EINA_FALSE, NULL, "eina_strbuf_append failed");
+       if (ret == EINA_FALSE)
+       {
+               _E("eina_strbuf_append failed");
+               eina_strbuf_free(strbuf);
+               return NULL;
+       }
 
        eina_strbuf_replace_all(strbuf, pattern, replace);
        result = eina_strbuf_string_steal(strbuf);
@@ -538,16 +543,16 @@ void indicator_get_time_by_region(char* output,void *data)
        char s_formatted[CLOCK_STR_LEN] = { 0, };
        char *s_convert_formatted = NULL;
 
-       char s_time_skeleton[20] = {0,};
+       char *s_time_skeleton = NULL;
        i18n_udatepg_h pattern_generator = NULL;
 
        int32_t best_pattern_len, formatted_len;
 
        if (clock_mode == INDICATOR_CLOCK_MODE_12H) {
-               strncpy(s_time_skeleton, "hm", 2);
+               s_time_skeleton = "hm";
        }
        else {
-               strncpy(s_time_skeleton, "Hm", 2);
+               s_time_skeleton = "Hm";
        }
 
        ret = system_settings_get_value_string(SYSTEM_SETTINGS_KEY_LOCALE_COUNTRY, &locale);