From: Tae-Young Chung Date: Fri, 16 Dec 2022 05:32:07 +0000 (+0900) Subject: [UTC][capi-media-vision][NonACR] return when GetValueForTCTSetting() is false X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ea285dcbc88a778d58de5bfc64571ba45fcdbe49;p=test%2Ftct%2Fnative%2Fapi.git [UTC][capi-media-vision][NonACR] return when GetValueForTCTSetting() is false It tries to allocat memory even if GetValueForTCTSetting() is false so that related variable are null. Then, it causes SIGSEGV. To prevent that, check GetValueForTCTSetting() first then check features if GetValueForTCTSetting() is true. Otherwise, just return startup function(). Change-Id: Iff5e87e654579908fb87599216842685f64993af Signed-off-by: Tae-Young Chung --- diff --git a/src/utc/capi-media-vision/utc-mv_3d.c b/src/utc/capi-media-vision/utc-mv_3d.c index 03900ab69..85fe5f186 100755 --- a/src/utc/capi-media-vision/utc-mv_3d.c +++ b/src/utc/capi-media-vision/utc-mv_3d.c @@ -214,14 +214,6 @@ void utc_capi_media_vision_3d_startup(void) { printf("capi-media-vision 3d tests STARTUP is launched\n"); - system_info_get_platform_bool(MV3D_DEPTH_FEATURE, &gIsMv3dDepthSupported); - system_info_get_platform_bool(MV3D_POINTCLOUD_FEATURE, &gIsMv3dPointCloudSupported); - - if (gIsMv3dDepthSupported || gIsMv3dPointCloudSupported) - gIsMv3dSupported = true; - else - gIsMv3dSupported = false; - char pszValue[CONFIG_VALUE_LEN_MAX] = {0,}; if (true == GetValueForTCTSetting("DEVICE_SUITE_TARGET_30", pszValue, API_NAMESPACE)) { PRINT_UTC_LOG("[Line : %d][%s] 'DEVICE_SUITE_TARGET_30' Values Received %s\\n", __LINE__, API_NAMESPACE, pszValue); @@ -231,8 +223,17 @@ void utc_capi_media_vision_3d_startup(void) } else { PRINT_UTC_LOG("[Line : %d][%s] GetValueForTCTSetting returned error for 'DEVICE_SUITE_TARGET_30'\\n", __LINE__, API_NAMESPACE); + return; } + system_info_get_platform_bool(MV3D_DEPTH_FEATURE, &gIsMv3dDepthSupported); + system_info_get_platform_bool(MV3D_POINTCLOUD_FEATURE, &gIsMv3dPointCloudSupported); + + if (gIsMv3dDepthSupported || gIsMv3dPointCloudSupported) + gIsMv3dSupported = true; + else + gIsMv3dSupported = false; + gStartupError = mv_create_engine_config(&gEngineConfigHandle); if (MEDIA_VISION_ERROR_NONE != gStartupError) { gEngineConfigHandle = NULL; diff --git a/src/utc/capi-media-vision/utc-mv_barcode.c b/src/utc/capi-media-vision/utc-mv_barcode.c index 79fd668d2..13ed175b2 100755 --- a/src/utc/capi-media-vision/utc-mv_barcode.c +++ b/src/utc/capi-media-vision/utc-mv_barcode.c @@ -619,12 +619,6 @@ void utc_capi_media_vision_barcode_startup(void) { printf("capi-media-vision tests STARTUP is launched\n"); - bool isBarcodeDetectionSupported = false; - bool isBarcodeGenerationSupported = false; - - system_info_get_platform_bool("http://tizen.org/feature/vision.barcode_detection", &isBarcodeDetectionSupported); - system_info_get_platform_bool("http://tizen.org/feature/vision.barcode_generation", &isBarcodeGenerationSupported); - char pszValue[CONFIG_VALUE_LEN_MAX] = {0,}; if (true == GetValueForTCTSetting("DEVICE_SUITE_TARGET_30", pszValue, API_NAMESPACE)) { PRINT_UTC_LOG("[Line: %d][%s] 'DEVICE_SUITE_TARGET_30' Values Received = %s\\n", __LINE__, API_NAMESPACE, pszValue); @@ -637,8 +631,14 @@ void utc_capi_media_vision_barcode_startup(void) snprintf(test_data_path, path_size, "%s/data", pszValue); } else { PRINT_UTC_LOG("[Line: %d][%s] GetValueForTCTSetting returned error for 'DEVICE_SUITE_TARGET_30'\\n", __LINE__, API_NAMESPACE); + return; } + bool isBarcodeDetectionSupported = false; + bool isBarcodeGenerationSupported = false; + + system_info_get_platform_bool("http://tizen.org/feature/vision.barcode_detection", &isBarcodeDetectionSupported); + system_info_get_platform_bool("http://tizen.org/feature/vision.barcode_generation", &isBarcodeGenerationSupported); if (isBarcodeDetectionSupported || isBarcodeGenerationSupported) isVisionSupported = true; diff --git a/src/utc/capi-media-vision/utc-mv_face.c b/src/utc/capi-media-vision/utc-mv_face.c index 597cbbb4d..301e83d7d 100755 --- a/src/utc/capi-media-vision/utc-mv_face.c +++ b/src/utc/capi-media-vision/utc-mv_face.c @@ -220,15 +220,6 @@ void utc_capi_media_vision_face_startup(void) { printf("capi-media-vision mv_face tests STARTUP is launched\n"); - bool isFaceRecognitionSupported = false; - - system_info_get_platform_bool("http://tizen.org/feature/vision.face_recognition", &isFaceRecognitionSupported); - - if (isFaceRecognitionSupported) - isVisionSupported = true; - else - isVisionSupported = false; - char pszValue[CONFIG_VALUE_LEN_MAX] = {0,}; if (true == GetValueForTCTSetting("DEVICE_SUITE_TARGET_30", pszValue, API_NAMESPACE)) { PRINT_UTC_LOG("[Line : %d][%s] 'DEVICE_SUITE_TARGET_30' Values Received %s\\n", __LINE__, API_NAMESPACE, pszValue); @@ -258,7 +249,18 @@ void utc_capi_media_vision_face_startup(void) snprintf(path_to_rec_model, strlen(pszValue)+strlen("/res/res/model/test_rec_model")+1, "%s/res/res/model/test_rec_model", pszValue); } else { PRINT_UTC_LOG("[Line : %d][%s] GetValueForTCTSetting returned error for 'DEVICE_SUITE_TARGET_30'\\n", __LINE__, API_NAMESPACE); + return; } + + bool isFaceRecognitionSupported = false; + + system_info_get_platform_bool("http://tizen.org/feature/vision.face_recognition", &isFaceRecognitionSupported); + + if (isFaceRecognitionSupported) + isVisionSupported = true; + else + isVisionSupported = false; + printf("capi-media-vision mv_face tests STARTUP is completed\n"); } diff --git a/src/utc/capi-media-vision/utc-mv_image.c b/src/utc/capi-media-vision/utc-mv_image.c index 1bdb50e55..1feaf17e0 100755 --- a/src/utc/capi-media-vision/utc-mv_image.c +++ b/src/utc/capi-media-vision/utc-mv_image.c @@ -164,14 +164,6 @@ void utc_capi_media_vision_image_startup(void) { printf("capi-media-vision mv_image tests STARTUP is launched\n"); - bool isImageRecognitionSupported = false; - system_info_get_platform_bool("http://tizen.org/feature/vision.image_recognition", &isImageRecognitionSupported); - - if (isImageRecognitionSupported) - isVisionSupported = true; - else - isVisionSupported = false; - char pszValue[CONFIG_VALUE_LEN_MAX] = {0,}; if (true == GetValueForTCTSetting("DEVICE_SUITE_TARGET_30", pszValue, API_NAMESPACE)) { PRINT_UTC_LOG("[Line : %d][%s] 'DEVICE_SUITE_TARGET_30' Values Received %s\\n", __LINE__, API_NAMESPACE, pszValue); @@ -188,8 +180,17 @@ void utc_capi_media_vision_image_startup(void) snprintf(pInternalDataPath, strlen(pszValue)+strlen("/data")+1, "%s/data", pszValue); } else { PRINT_UTC_LOG("[Line : %d][%s] GetValueForTCTSetting returned error for 'DEVICE_SUITE_TARGET_30'\\n", __LINE__, API_NAMESPACE); + return; } + bool isImageRecognitionSupported = false; + system_info_get_platform_bool("http://tizen.org/feature/vision.image_recognition", &isImageRecognitionSupported); + + if (isImageRecognitionSupported) + isVisionSupported = true; + else + isVisionSupported = false; + gStartupError = mv_image_tracking_model_create(&g_tracking_model); if (MEDIA_VISION_ERROR_NONE != gStartupError) { g_tracking_model = NULL; diff --git a/src/utc/capi-media-vision/utc-mv_surveillance.c b/src/utc/capi-media-vision/utc-mv_surveillance.c index ce636afdf..4651cdc85 100755 --- a/src/utc/capi-media-vision/utc-mv_surveillance.c +++ b/src/utc/capi-media-vision/utc-mv_surveillance.c @@ -51,19 +51,8 @@ static char* pInternalStoragePath=NULL; */ void utc_capi_media_vision_surveillance_startup(void) { - bool isFaceRecognitionSupported = false; - bool isImageRecognitionSupported = false; - printf("capi-media-vision surveillance tests STARTUP is launched\n"); - system_info_get_platform_bool("http://tizen.org/feature/vision.face_recognition", &isFaceRecognitionSupported); - system_info_get_platform_bool("http://tizen.org/feature/vision.image_recognition", &isImageRecognitionSupported); - - if (isFaceRecognitionSupported || isImageRecognitionSupported) - isVisionSupported = true; - else - isVisionSupported = false; - char pszValue[CONFIG_VALUE_LEN_MAX] = {0,}; if (true == GetValueForTCTSetting("DEVICE_SUITE_TARGET_30", pszValue, API_NAMESPACE)) { PRINT_UTC_LOG("[Line : %d][%s] 'DEVICE_SUITE_TARGET_30' Values Received %s\\n", __LINE__, API_NAMESPACE, pszValue); @@ -71,8 +60,20 @@ void utc_capi_media_vision_surveillance_startup(void) snprintf(pInternalStoragePath, strlen(pszValue)+1, "%s", pszValue); } else { PRINT_UTC_LOG("[Line : %d][%s] GetValueForTCTSetting returned error for 'DEVICE_SUITE_TARGET_30'\\n", __LINE__, API_NAMESPACE); + return; } + bool isFaceRecognitionSupported = false; + bool isImageRecognitionSupported = false; + + system_info_get_platform_bool("http://tizen.org/feature/vision.face_recognition", &isFaceRecognitionSupported); + system_info_get_platform_bool("http://tizen.org/feature/vision.image_recognition", &isImageRecognitionSupported); + + if (isFaceRecognitionSupported || isImageRecognitionSupported) + isVisionSupported = true; + else + isVisionSupported = false; + gStartupError = MEDIA_VISION_ERROR_NONE; gStartupError = mv_surveillance_event_trigger_create(