From 15656be96aa2f4c342b77df537443fbb9f830d8b Mon Sep 17 00:00:00 2001
From: Jeon Sang-Heon <sh95.jeon@samsung.com>
Date: Tue, 11 Feb 2020 14:52:04 +0900
Subject: [PATCH] Fix svace issue

- Check if return value of strtok_r is null

Change-Id: I0eae2665d227ac730fed7de3f7b49c0255224c19
---
 src/plugin/plugin.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/plugin/plugin.c b/src/plugin/plugin.c
index 13e6efd..2dbb25a 100644
--- a/src/plugin/plugin.c
+++ b/src/plugin/plugin.c
@@ -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++;
-- 
2.34.1