Fix SVACE issue. 52/106352/1 accepted/tizen/3.0/ivi/20161226.024555 accepted/tizen/3.0/mobile/20161226.024502 accepted/tizen/3.0/tv/20161226.024517 accepted/tizen/3.0/wearable/20161226.024532 submit/tizen_3.0/20161221.103425
authorSangJin Kim <sangjin3.kim@samsung.com>
Wed, 21 Dec 2016 10:32:08 +0000 (19:32 +0900)
committerSangJin Kim <sangjin3.kim@samsung.com>
Wed, 21 Dec 2016 10:32:08 +0000 (19:32 +0900)
Change-Id: I640624dc49117b8eca6034b41ae33b2e52b8eb8c
Signed-off-by: SangJin Kim <sangjin3.kim@samsung.com>
src/default_plugin_appcmd.c

index 4bc158e..07a41d1 100644 (file)
@@ -332,11 +332,15 @@ static void appcmd_receiver_packagelist(int fd_in, int fd_out)
     char out_buf[4096] = {0,};
     int out_ptr = 0;
     int r;
+    char* sub1;
+    char* sub2;
 
     snprintf(out_buf, sizeof(out_buf), "\n%s", MESSAGE_PREFIX_APPCMD_RETURN);
     out_ptr = strlen(out_buf);
 
     for(;;) {
+        sub1 = NULL;
+        sub2 = NULL;
         memset(buf, 0, sizeof(buf));
         r = read_line(fd_in, buf, sizeof(buf));
         if (r == 0) {
@@ -350,17 +354,22 @@ static void appcmd_receiver_packagelist(int fd_in, int fd_out)
         }
 
         D("pkgcmd output : %s\n", buf);
-        char* sub1 = NULL;
-        char* sub2 = NULL;
         sub1 = strstr(buf, "pkgid [");
-        if (sub1 != NULL) {
-            sub1 = strstr(sub1, "[")+1;
-            sub2 = strstr(sub1, "]");
-            sub2[0] = '\0';
-
-            snprintf(out_buf+out_ptr, sizeof(out_buf)-out_ptr, ":%s", sub1);
-            out_ptr += strlen(sub1)+1;
+        if (sub1 == NULL) {
+            continue;
+        }
+        sub1 = strstr(sub1, "[")+1;
+        if (sub1 == NULL) {
+            continue;
         }
+        sub2 = strstr(sub1, "]");
+        if (sub2 == NULL) {
+            continue;
+        }
+        sub2[0] = '\0';
+
+        snprintf(out_buf+out_ptr, sizeof(out_buf)-out_ptr, ":%s", sub1);
+        out_ptr += strlen(sub1)+1;
     }
 
     snprintf(out_buf+out_ptr, sizeof(out_buf)-out_ptr, "\n");