diff options
| author | Tae-Young Chung <ty83.chung@samsung.com> | 2019-10-02 11:13:12 +0900 |
|---|---|---|
| committer | Tae-Young Chung <ty83.chung@samsung.com> | 2019-10-02 14:10:00 +0900 |
| commit | 31fd4820c6f488e8c599b54b3394f07516f8f20d (patch) | |
| tree | a45a513ffb5c31dd5309df80baccc7cf04d4256f /mv_common | |
| parent | b335dbcdcc9c9fbc034063403539e63524ac1ad3 (diff) | |
| download | mediavision-31fd4820c6f488e8c599b54b3394f07516f8f20d.tar.gz mediavision-31fd4820c6f488e8c599b54b3394f07516f8f20d.tar.bz2 mediavision-31fd4820c6f488e8c599b54b3394f07516f8f20d.zip | |
Fix resource leak issues and svace issues
CID 1087571, 1087654, 1087562, 1087542, 1087540
Change-Id: Ia054980b6d7e76bef5895f48e1c89f6d3d1ef975
Signed-off-by: Tae-Young Chung <ty83.chung@samsung.com>
Diffstat (limited to 'mv_common')
| -rw-r--r-- | mv_common/src/mv_common_c.cpp | 10 | ||||
| -rw-r--r-- | mv_common/src/mv_private.c | 4 |
2 files changed, 11 insertions, 3 deletions
diff --git a/mv_common/src/mv_common_c.cpp b/mv_common/src/mv_common_c.cpp index fa4b6f80..28ba8382 100644 --- a/mv_common/src/mv_common_c.cpp +++ b/mv_common/src/mv_common_c.cpp @@ -594,7 +594,15 @@ int mv_engine_config_get_string_attribute_c( return MEDIA_VISION_ERROR_OUT_OF_MEMORY; } - if (attributeValue.copy(*value, stringSize) != attributeValue.size()) { + try { + size_t copiedSize = attributeValue.copy(*value, stringSize); + if (copiedSize != attributeValue.size()) { + LOGE("Conversion from string to char* failed"); + free(*value); + (*value) = NULL; + return MEDIA_VISION_ERROR_INVALID_OPERATION; + } + } catch (std::out_of_range& e) { LOGE("Conversion from string to char* failed"); free(*value); (*value) = NULL; diff --git a/mv_common/src/mv_private.c b/mv_common/src/mv_private.c index 68cbb6bd..16ae6a41 100644 --- a/mv_common/src/mv_private.c +++ b/mv_common/src/mv_private.c @@ -66,7 +66,7 @@ bool __mv_check_system_info_feature_supported() "http://tizen.org/feature/vision.inference.image", &isInferenceImageSupported); - if (nRetVal4 != SYSTEM_INFO_ERROR_NONE) { + if (nRetVal5 != SYSTEM_INFO_ERROR_NONE) { LOGE("SYSTEM_INFO_ERROR: vision.inference.image"); return false; } @@ -75,7 +75,7 @@ bool __mv_check_system_info_feature_supported() "http://tizen.org/feature/vision.inference.face", &isInferenceFaceSupported); - if (nRetVal4 != SYSTEM_INFO_ERROR_NONE) { + if (nRetVal6 != SYSTEM_INFO_ERROR_NONE) { LOGE("SYSTEM_INFO_ERROR: vision.inference.face"); return false; } |