[Tizen 6.0] enable build with GCC 9.2 25/221725/2 accepted/tizen/unified/20200108.131411 submit/tizen/20200107.120532
authorAbhishek Vijay <abhishek.v@samsung.com>
Tue, 7 Jan 2020 06:31:13 +0000 (12:01 +0530)
committerAbhishek Vijay <abhishek.v@samsung.com>
Tue, 7 Jan 2020 06:58:08 +0000 (12:28 +0530)
Change-Id: Id6958895fa64ac0b5f2ef182a624c67b540841f3
Signed-off-by: Abhishek Vijay <abhishek.v@samsung.com>
include/myaccount_ug_account_list.h
include/myaccount_ug_addaccount.h
src/myaccount_ug_account_list.c
src/myaccount_ug_common.c

index d555bf2ff85bc151998e075aa51aa47fe5412006..02c6f3428abcdd303c40e97e61192aba4b777854 100755 (executable)
@@ -40,7 +40,7 @@ typedef struct __account_list_priv {
        int list_index;\r
        int sync_status;\r
        GSList *capablity_list;\r
-       char service_sname[256];\r
+       char service_sname[384]; /*256+128*/\r
 } myaccount_list_priv;\r
 \r
 void myaccount_list_view_create(myaccount_appdata *priv);\r
index 551d084b408554764092cf617fcfd1268998c6cc..08235f3302d656f4558ac68cab5e9abf64779db4 100755 (executable)
@@ -25,7 +25,7 @@
 \r
 typedef struct __addaccount_list_priv {\r
        char service_name[256];\r
-       char service_sname[256];\r
+       char service_sname[384]; /*256+128*/\r
        char package_name[256];\r
        char icon_path[1024];\r
        MyAccountProviderType sp_type;\r
index 91c952f25d577cead3a5bd439f54e1a176c10bb7..75a2c2e3651b9b0da893b4765b80d4d69efcc08d 100755 (executable)
@@ -86,8 +86,7 @@ bool _myaccount_account_list_get_capablity_text(const char* capability_type,
        account_info->capablity_list = g_slist_append(account_info->capablity_list, (gpointer)cap_data);
 
        if (capability_state == ACCOUNT_CAPABILITY_ENABLED) {
-               capability_string = __myaccount_account_list_get_capablity_string_value(
-                                                                                                                       capability_type);
+               capability_string = __myaccount_account_list_get_capablity_string_value(capability_type);
 
                if (capability_string != NULL) {
                        if (strlen(capability_textbuf) > 0) {
@@ -99,8 +98,8 @@ bool _myaccount_account_list_get_capablity_text(const char* capability_type,
                                MA_SNPRINTF(capability_textbuf, 127, "%s, %s", temp2, capability_string);
                                MA_MEMFREE(temp2);
                        } else {
-                               MA_SNPRINTF(capability_textbuf, 127, "%s%s", capability_textbuf,
-                                                                                                                       capability_string);
+                               if (strlen(capability_textbuf) < 128)
+                                       capability_textbuf[strlen(capability_textbuf) + 1] = '\0';
                        }
                }
 
@@ -389,7 +388,8 @@ static char *__myaccount_account_list_gl_label_get(void *data,
 static Evas_Object *__myaccount_account_list_gl_icon_get(void *data,
                                                                                        Evas_Object *obj, const char *part)
 {
-       char tempbuf[PATH_MAX];
+       char tempbuf[PATH_MAX+1];
+       int icon_path_len = 0;
        Evas_Object *icon = NULL;
        myaccount_list_priv *account_info_item = (myaccount_list_priv*)data;
 
@@ -397,10 +397,11 @@ static Evas_Object *__myaccount_account_list_gl_icon_get(void *data,
                MYACCOUNT_ERROR("__myaccount_account_list_gl_icon_get: Data is NULL\n");
                return NULL;
        }
-       memset(tempbuf, 0, sizeof(char)*PATH_MAX);
+       memset(tempbuf, 0, sizeof(char)*(PATH_MAX+1));
 
        if (!strcmp(part, "elm.swallow.icon")) {
-               if (strlen(account_info_item->icon_path) > 0) {
+               icon_path_len = strlen(account_info_item->icon_path);
+               if (icon_path_len > 0 && icon_path_len <= (PATH_MAX + 1)) {
                        MA_SNPRINTF(tempbuf, sizeof(tempbuf), "%s", account_info_item->icon_path);
                } else {
                        MA_SNPRINTF(tempbuf, sizeof(tempbuf), "%s", "A01_2_Icon_default.png");
index 91109c1e282eb7b367d1177a699f00e82e1d629e..bb5dc234ae4e081c7ad701ed97667533e57595ad 100755 (executable)
@@ -493,15 +493,17 @@ int  myaccount_common_launch_application(MyAccountRequestViewType
                MYACCOUNT_ERROR("app_control_send_launch_request fail, ret = %d\n", ret);\r
        }\r
 \r
-       MA_MEMFREE(username);\r
-       MA_MEMFREE(package_name);\r
-\r
        if (ret != APP_CONTROL_ERROR_NONE) {\r
                MYACCOUNT_SLOGE("(%s) launch fail. ret(%x)\n", package_name, ret);\r
                _myaccount_common_try_relaunch(ad, app_control);\r
+               MA_MEMFREE(username);\r
+               MA_MEMFREE(package_name);\r
                return 0;\r
        }\r
 \r
+       MA_MEMFREE(username);\r
+       MA_MEMFREE(package_name);\r
+\r
        app_control_destroy(app_control);\r
        _myaccount_common_launch_timer_start(ad);\r
 \r
@@ -726,7 +728,8 @@ static bool _myaccount_common_get_account_type_count_cb(account_type_h account_t
 \r
        if (type_int == FALSE\r
                && account_query_account_by_package_name(myaccount_common_account_by_package_name_cb, type_buf, NULL) == ACCOUNT_ERROR_NONE) {\r
-               MYACCOUNT_SLOGD("Multiple account not support (%s)\n", type_buf);\r
+               if (type_buf != NULL)\r
+                       MYACCOUNT_SLOGD("Multiple account not support (%s)\n", type_buf);\r
                MA_MEMFREE(type_buf);\r
                return TRUE;\r
        }\r