Delete null check before free

C standards 7.20.3.2/2 from ISO-IEC 9899 note free check null, so it's all dummy code.

Change-Id: Iec43e9040ce7d26c6ee45d388e66cf3f8f670b0e
Signed-off-by: Kwanghoon Son <k.son@samsung.com>

diff --git a/mv_3d/3d/src/mv_3d_open.cpp b/mv_3d/3d/src/mv_3d_open.cpp
index 4b3b0eb509ff5fb366f036b4b8bebeabae3f264d..3f1e4af0ce628fceea8e51fdc212d7cc931c3076 100644 (file)
--- a/mv_3d/3d/src/mv_3d_open.cpp
+++ b/mv_3d/3d/src/mv_3d_open.cpp
@@ -180,15 +180,11 @@ int mv3dConfigure(mv_3d_h mv3d, mv_engine_config_h engine_config)
        }
 
 out:
-       if (pointcloudOutputFilePath) {
-               free(pointcloudOutputFilePath);
-               pointcloudOutputFilePath = NULL;
-       }
+       free(pointcloudOutputFilePath);
+       pointcloudOutputFilePath = NULL;
 
-       if (stereoConfigFilePath) {
-               free(stereoConfigFilePath);
-               stereoConfigFilePath = NULL;
-       }
+       free(stereoConfigFilePath);
+       stereoConfigFilePath = NULL;
 
        LOGI("LEAVE");
 

diff --git a/mv_machine_learning/inference/src/mv_inference_open.cpp b/mv_machine_learning/inference/src/mv_inference_open.cpp
index c7854b7198a1bbb58e30ad7b3fc906dd5a7d1f47..9a8ec6a944c8612ef0dd0bbfe88aaf7daf531912 100644 (file)
--- a/mv_machine_learning/inference/src/mv_inference_open.cpp
+++ b/mv_machine_learning/inference/src/mv_inference_open.cpp
@@ -154,8 +154,7 @@ static int configure_tensor_info_from_meta_file(Inference *pInfer, mv_engine_con
        }
 
 release_model_meta_file_path:
-       if (modelMetaFilePath)
-               free(modelMetaFilePath);
+       free(modelMetaFilePath);
 
 out_of_function:
        LOGI("LEAVE");
@@ -231,16 +230,13 @@ static int configure_model_open(Inference *pInfer, mv_engine_config_h engine_con
                                                                std::string(modelUserFilePath));
 
 release_model_user_file_path:
-       if (modelUserFilePath)
-               free(modelUserFilePath);
+       free(modelUserFilePath);
 
 release_model_weight_file_path:
-       if (modelWeightFilePath)
-               free(modelWeightFilePath);
+       free(modelWeightFilePath);
 
 release_model_config_file_path:
-       if (modelConfigFilePath)
-               free(modelConfigFilePath);
+       free(modelConfigFilePath);
 
 out_of_function:
        LOGI("LEAVE");
@@ -302,10 +298,8 @@ static int configure_input_info_open(Inference *pInfer, mv_engine_config_h engin
        pInfer->ConfigureInputInfo(tensorWidth, tensorHeight, 1, tensorCh, stdValue, meanValue, dataType,
                                                           std::vector<std::string>(1, std::string(node_name)));
 
-       if (node_name) {
-               free(node_name);
-               node_name = NULL;
-       }
+       free(node_name);
+       node_name = NULL;
 
 out_of_function:
        LOGI("LEAVE");

diff --git a/mv_surveillance/surveillance/src/EventTrigger.cpp b/mv_surveillance/surveillance/src/EventTrigger.cpp
index 94642de45281803788d0ae4d64fe231370862144..2746d9c1ba857cc5563818dae1beb7130e8a066c 100644 (file)
--- a/mv_surveillance/surveillance/src/EventTrigger.cpp
+++ b/mv_surveillance/surveillance/src/EventTrigger.cpp
@@ -129,11 +129,9 @@ int EventTrigger::applyROIToImage(unsigned char *image, int imageWidth, int imag
 
                int error = mv_get_mask_buffer(imageWidth, imageHeight, scaledPoints.data(), (int) roiSize, &maskBuffer);
 
-               if (error != MEDIA_VISION_ERROR_NONE || maskBuffer == NULL) {
-                       if (maskBuffer != NULL) {
-                               free(maskBuffer);
-                               maskBuffer = NULL;
-                       }
+               if (error != MEDIA_VISION_ERROR_NONE) {
+                       free(maskBuffer);
+                       maskBuffer = NULL;
 
                        LOGE("Getting mask buffer failed.");
                        return error;

diff --git a/mv_surveillance/surveillance/src/EventTriggerPersonRecognition.cpp b/mv_surveillance/surveillance/src/EventTriggerPersonRecognition.cpp
index 7a23796344235e5ccf4ee8a048bdddf3b90d3183..750402ba9eb42b0dc889d59a8956ab7f157e914f 100644 (file)
--- a/mv_surveillance/surveillance/src/EventTriggerPersonRecognition.cpp
+++ b/mv_surveillance/surveillance/src/EventTriggerPersonRecognition.cpp
@@ -118,10 +118,8 @@ int EventTriggerPersonRecognition::parseEngineConfig(mv_engine_config_h engineCo
                                                                                                          &modelPath);
 
        if (error != MEDIA_VISION_ERROR_NONE) {
-               if (modelPath != NULL) {
-                       free(modelPath);
-                       modelPath = NULL;
-               }
+               free(modelPath);
+               modelPath = NULL;
 
                LOGE("Getting recognition model from engine configuration failed.");
 
@@ -135,10 +133,8 @@ int EventTriggerPersonRecognition::parseEngineConfig(mv_engine_config_h engineCo
        if (error != MEDIA_VISION_ERROR_NONE) {
                LOGE("Loading recognition model from file %s failed.", modelPath);
 
-               if (modelPath != NULL) {
-                       free(modelPath);
-                       modelPath = NULL;
-               }
+               free(modelPath);
+               modelPath = NULL;
 
                const int err = mv_face_recognition_model_destroy(recognitionModel);
                if (MEDIA_VISION_ERROR_NONE != err) {
@@ -166,18 +162,14 @@ int EventTriggerPersonRecognition::parseEngineConfig(mv_engine_config_h engineCo
                         "engine config.",
                         MV_SURVEILLANCE_FACE_RECOGNITION_MODEL_FILE_PATH);
 
-               if (modelPath != NULL) {
-                       free(modelPath);
-                       modelPath = NULL;
-               }
+               free(modelPath);
+               modelPath = NULL;
 
                return MEDIA_VISION_ERROR_INVALID_PARAMETER;
        }
 
-       if (modelPath != NULL) {
-               free(modelPath);
-               modelPath = NULL;
-       }
+       free(modelPath);
+       modelPath = NULL;
 
        return MEDIA_VISION_ERROR_NONE;
 }

diff --git a/mv_surveillance/surveillance/src/mv_surveillance.c b/mv_surveillance/surveillance/src/mv_surveillance.c
index 45b9cf14f359f5df25f0598d5c77c661fd9f97ef..1facc7640fc788d6d0444f7f9ef685e8784d5483 100644 (file)
--- a/mv_surveillance/surveillance/src/mv_surveillance.c
+++ b/mv_surveillance/surveillance/src/mv_surveillance.c
@@ -104,10 +104,8 @@ int mv_surveillance_set_event_trigger_roi(mv_surveillance_event_trigger_h trigge
 
        mv_surveillance_event_trigger_s *handle = (mv_surveillance_event_trigger_s *) trigger;
 
-       if (handle->roi) {
-               free(handle->roi);
-               handle->roi = NULL;
-       }
+       free(handle->roi);
+       handle->roi = NULL;
 
        handle->number_of_roi_points = number_of_points;
        handle->roi = (mv_point_s *) malloc(sizeof(mv_point_s) * number_of_points);

diff --git a/test/assessment/surveillance/assessment_surveillance.cpp b/test/assessment/surveillance/assessment_surveillance.cpp
index ca9c11d0b34a113a8000c16314129fa7c2539078..071ea13f826456af22b2dfc1bf10f80aa6bbeb51 100644 (file)
--- a/test/assessment/surveillance/assessment_surveillance.cpp
+++ b/test/assessment/surveillance/assessment_surveillance.cpp
@@ -68,8 +68,7 @@ void movement_detected_cb(mv_surveillance_event_trigger_h event_trigger, mv_sour
 
        if (error != MEDIA_VISION_ERROR_NONE) {
                LOGE("Error with code %d was occurred in getting movement regions.", error);
-               if (movement_regions != NULL)
-                       free(movement_regions);
+               free(movement_regions);
                return;
        }
 
@@ -91,8 +90,7 @@ void movement_detected_cb(mv_surveillance_event_trigger_h event_trigger, mv_sour
        out_buffer_copy = (unsigned char *) malloc(buf_size);
        if (out_buffer_copy == NULL) {
                LOGE("Failed to malloc out_buffer_copy");
-               if (movement_regions != NULL)
-                       free(movement_regions);
+               free(movement_regions);
                return;
        }
        memcpy(out_buffer_copy, out_buffer, buf_size);
@@ -115,12 +113,10 @@ void movement_detected_cb(mv_surveillance_event_trigger_h event_trigger, mv_sour
                findex++;
        }
 
-       if (movement_regions != NULL)
-               free(movement_regions);
+       free(movement_regions);
 
 #if DUMP_JPEG
-       if (out_buffer_copy != NULL)
-               free(out_buffer_copy);
+       free(out_buffer_copy);
 #endif
 
        MEDIA_VISION_FUNCTION_LEAVE();

diff --git a/test/testsuites/barcode/barcode_test_suite.c b/test/testsuites/barcode/barcode_test_suite.c
index 173b629cb63a2a63ccb339e84f1810fe540e1552..e6c9fac53961b4076ef90d8a9e5c62c412def67d 100644 (file)
--- a/test/testsuites/barcode/barcode_test_suite.c
+++ b/test/testsuites/barcode/barcode_test_suite.c
@@ -288,10 +288,9 @@ bool _mv_engine_config_supported_attribute(mv_config_attribute_type_e attribute_
                        return false;
                }
                mvprintw(current_y++, MINX, "Default string attribute %s was set to %s in engine", attribute_name, str_value);
-               if (str_value != NULL) {
-                       free(str_value);
-                       str_value = NULL;
-               }
+
+               free(str_value);
+               str_value = NULL;
                break;
        default:
                mvprintw(current_y++, MINX, "Not supported attribute type");
@@ -689,8 +688,7 @@ int detect_barcode(barcode_model_s model, mv_rectangle_s roi)
                if (data_buffer != NULL)
                        destroy_loaded_buffer(data_buffer);
 
-               if (converted_buffer)
-                       free(converted_buffer);
+               free(converted_buffer);
 
                MEDIA_VISION_FUNCTION_LEAVE();
 
@@ -723,8 +721,7 @@ int detect_barcode(barcode_model_s model, mv_rectangle_s roi)
                if (data_buffer != NULL)
                        destroy_loaded_buffer(data_buffer);
 
-               if (converted_buffer)
-                       free(converted_buffer);
+               free(converted_buffer);
 
                if (mv_engine_config)
                        mv_destroy_engine_config(mv_engine_config);
@@ -742,8 +739,7 @@ int detect_barcode(barcode_model_s model, mv_rectangle_s roi)
                if (data_buffer != NULL)
                        destroy_loaded_buffer(data_buffer);
 
-               if (converted_buffer)
-                       free(converted_buffer);
+               free(converted_buffer);
 
                if (mv_engine_config)
                        mv_destroy_engine_config(mv_engine_config);
@@ -754,8 +750,7 @@ int detect_barcode(barcode_model_s model, mv_rectangle_s roi)
                return err;
        }
 
-       if (converted_buffer != NULL)
-               free(converted_buffer);
+       free(converted_buffer);
 
        err = mv_barcode_detect(source, mv_engine_config, roi, barcode_detected_cb, &model);
 
@@ -1211,11 +1206,9 @@ int perform_detect()
 
        int err = detect_barcode(detect_model, roi);
 
-       if (detect_model.file_name != NULL)
-               free(detect_model.file_name);
+       free(detect_model.file_name);
 
-       if (detect_model.out_file_name != NULL)
-               free(detect_model.out_file_name);
+       free(detect_model.out_file_name);
 
        if (err != MEDIA_VISION_ERROR_NONE)
                LOGE("Barcode detection failed with error code (0x%08x)", err);
@@ -1303,17 +1296,10 @@ int perform_generate(void)
        const int err = gen_fcn == MV_TS_GENERATE_TO_IMAGE_FCN ? generate_barcode_to_image(generate_model) :
                                                                                                                         generate_barcode_to_source(generate_model);
 
-       if (generate_model.message != NULL)
-               free(generate_model.message);
-
-       if (generate_model.file_name != NULL)
-               free(generate_model.file_name);
-
-       if (generate_model.front_color != NULL)
-               free(generate_model.front_color);
-
-       if (generate_model.back_color != NULL)
-               free(generate_model.back_color);
+       free(generate_model.message);
+       free(generate_model.file_name);
+       free(generate_model.front_color);
+       free(generate_model.back_color);
 
        if (err != MEDIA_VISION_ERROR_NONE) {
                LOGE("Barcode generation failed with error code (0x%08x)", err);

diff --git a/test/testsuites/common/visualizer/src/mv_util_render_2d.cpp b/test/testsuites/common/visualizer/src/mv_util_render_2d.cpp
index 6e1fcf173db1ad7e7a43542623b508bf7b15192e..54058d5ae640162a1a2a2d3baa4125968b7e00d4 100644 (file)
--- a/test/testsuites/common/visualizer/src/mv_util_render_2d.cpp
+++ b/test/testsuites/common/visualizer/src/mv_util_render_2d.cpp
@@ -281,8 +281,7 @@ static EGLConfig find_egl_config(int r, int g, int b, int a, int d, int s, int m
        }
 
 exit:
-       if (conf_array)
-               free(conf_array);
+       free(conf_array);
 
        return conf;
 }