Fix svace issue 01/224501/1
authorJeon Sang-Heon <sh95.jeon@samsung.com>
Tue, 11 Feb 2020 05:52:04 +0000 (14:52 +0900)
committerJeon Sang-Heon <sh95.jeon@samsung.com>
Tue, 11 Feb 2020 05:52:04 +0000 (14:52 +0900)
- Check if return value of strtok_r is null

Change-Id: I0eae2665d227ac730fed7de3f7b49c0255224c19

src/plugin/plugin.c

index 13e6efd7827e8f77897bf68df4a5a7a3c2685dc9..2dbb25a74e9ae85c353bccde92cf5106fab0b9a3 100644 (file)
@@ -252,14 +252,20 @@ static int parse_and_set_firmware_info(char *json)
                        break;
                key = strdup(token);
                token = strtok_r(NULL, ",\"", &saveptr);
-               if (*token != ':') {
+               if (!token || *token != ':') {
                        _E("Invalid json format");
                        free(key);
                        return -1;
                }
+
                if (strlen(token) == 1) {
                        token = strtok_r(NULL, "\"", &saveptr);
-                       if (*token == ',' || *token == '}')
+                       if (!token) {
+                               _E("Invalid json format");
+                               free(key);
+                               return -1;
+                       }
+                       else if (*token == ',' || *token == '}')
                                *token = 0;
                } else {
                        token++;