Fix DEREF_OF_NULL.RET.PROC.STAT checker issue 35/224135/2
authorTae-Young Chung <ty83.chung@samsung.com>
Thu, 6 Feb 2020 11:06:23 +0000 (20:06 +0900)
committerTae-Young Chung <ty83.chung@samsung.com>
Tue, 11 Feb 2020 01:49:49 +0000 (10:49 +0900)
WGID 410845

Change-Id: Ied8ccc820da1b28a13f1cadaa6ad4b204c3ff924
Signed-off-by: Tae-Young Chung <ty83.chung@samsung.com>
mv_common/src/EngineConfig.cpp

index 71a8815dd5183e24afe1eb678c26e76be0c5f286..8fad23380c948004f749639154642c9465849646 100644 (file)
@@ -345,9 +345,9 @@ int EngineConfig::cacheDictionaries(bool isLazyCache, std::string configFilePath
                        }
 
                        const char *nameStr =
-                                               (char*)json_object_get_string_member(attr_obj, "name");
+                                               (const char*)json_object_get_string_member(attr_obj, "name");
                        const char *typeStr =
-                                               (char*)json_object_get_string_member(attr_obj, "type");
+                                               (const char*)json_object_get_string_member(attr_obj, "type");
 
                        if (NULL == nameStr || NULL == typeStr) {
                                LOGW("Attribute %i wasn't parsed from json file. name and/or "
@@ -366,7 +366,11 @@ int EngineConfig::cacheDictionaries(bool isLazyCache, std::string configFilePath
                                DefStrDict[std::string(nameStr)] =
                                        (char*)json_object_get_string_member(attr_obj, "value");
                        } else if (0 == strcmp("array", typeStr)) {
-                               const char *subTypeStr = (char*)json_object_get_string_member(attr_obj, "subtype");
+                               const char *subTypeStr = (const char*)json_object_get_string_member(attr_obj, "subtype");
+
+                               if (NULL == subTypeStr)
+                                       continue;
+
                                if (0 == strcmp("string", subTypeStr)) {
                                        JsonArray *attr_array = json_object_get_array_member(attr_obj, "value");
                                        std::vector<std::string> defaultVecStr;