Null check for strtok_r 05/262305/2 accepted/tizen/6.5/unified/20211028.093813 accepted/tizen/unified/20210809.125005 accepted/tizen/unified/20210826.123634 submit/tizen/20210809.071123 submit/tizen/20210825.084539 submit/tizen_6.5/20211028.161701 tizen_6.5.m2_release
authorLohit Agarwalla <l.agarwalla@samsung.com>
Fri, 6 Aug 2021 07:30:23 +0000 (13:00 +0530)
committerLohit Agarwalla <l.agarwalla@samsung.com>
Fri, 6 Aug 2021 07:46:24 +0000 (13:16 +0530)
Change-Id: Id4349444446f10c28cc1eb6135bd7f4e616a33a0
Signed-off-by: Lohit Agarwalla <l.agarwalla@samsung.com>
src/account.c

index 081cf88..6ff7aa0 100644 (file)
@@ -2956,7 +2956,16 @@ static void _account_subscribe_vconf_callback(keynode_t *key, void *user_data)
                char *ptr = NULL;
 
                event_type = strtok_r(msg, ":", &ptr);
+               if (event_type == NULL) {
+                        ACCOUNT_ERROR("strtok_r() failed");
+                        goto END;
+                }
+
                id = strtok_r(NULL, ":", &ptr);
+               if (id == NULL) {
+                        ACCOUNT_ERROR("strtok_r() failed");
+                        goto END;
+                }
 
                ACCOUNT_SLOGD("msg(%s), event_type(%s), id(%s)", msg, event_type, id);
 
@@ -2967,6 +2976,7 @@ static void _account_subscribe_vconf_callback(keynode_t *key, void *user_data)
                if (tmp->account_subscription_callback)
                        tmp->account_subscription_callback(event_msg, account_id, tmp->user_data);
 
+END:
                _ACCOUNT_FREE(msg);
        }
 }