summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTae-Young Chung <ty83.chung@samsung.com>2020-02-06 20:06:23 +0900
committerTae-Young Chung <ty83.chung@samsung.com>2020-02-11 10:49:49 +0900
commit33e57356c6fe572c22e8447ca3fc256a90089059 (patch)
treef573a115852d4356100b7cd26c3ab7ec2936bff1
parente8e8c253a10f3e2968314446a3f5c3a508bfab78 (diff)
downloadmediavision-33e57356c6fe572c22e8447ca3fc256a90089059.tar.gz
mediavision-33e57356c6fe572c22e8447ca3fc256a90089059.tar.bz2
mediavision-33e57356c6fe572c22e8447ca3fc256a90089059.zip
Fix DEREF_OF_NULL.RET.PROC.STAT checker issue
WGID 410845 Change-Id: Ied8ccc820da1b28a13f1cadaa6ad4b204c3ff924 Signed-off-by: Tae-Young Chung <ty83.chung@samsung.com>
-rw-r--r--mv_common/src/EngineConfig.cpp10
1 files changed, 7 insertions, 3 deletions
diff --git a/mv_common/src/EngineConfig.cpp b/mv_common/src/EngineConfig.cpp
index 71a8815d..8fad2338 100644
--- a/mv_common/src/EngineConfig.cpp
+++ b/mv_common/src/EngineConfig.cpp
@@ -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;