Deallocate resources to prevent resource leak

 - Resource leaks were detected by static analyzer

Change-Id: I638d74b22fd4f0c7af633ef9fdfb568ad4c9a906

diff --git a/src/image_util.c b/src/image_util.c
index d1402d3..63f57e8 100644 (file)
--- a/src/image_util.c
+++ b/src/image_util.c
@@ -272,16 +272,15 @@ static int __image_util_image_to_packet(image_util_image_h image, media_packet_h
        }
 
        ret = __create_media_packet(fmt, buffer, buffer_size, packet);
-       if (ret != IMAGE_UTIL_ERROR_NONE) {
+       if (ret != IMAGE_UTIL_ERROR_NONE)
                image_util_error("__create_media_packet failed (%d)", ret);
-               media_format_unref(fmt);
-               IMAGE_UTIL_SAFE_FREE(buffer);
-               return IMAGE_UTIL_ERROR_INVALID_OPERATION;
-       }
+
+       media_format_unref(fmt);
+       IMAGE_UTIL_SAFE_FREE(buffer);
 
        image_util_fleave();
 
-       return IMAGE_UTIL_ERROR_NONE;
+       return ret;
 }
 
 gpointer __transform_thread(gpointer data)
@@ -424,8 +423,7 @@ static int __image_util_packet_to_image(media_packet_h packet, image_util_image_
                size += plane_size;
        }
 
-       image_util_debug("[Fotmat: %u] W x H : %d x %d", mimetype, width, height);
-       image_util_retvm_if(((width <= 0) || (height <= 0) || (size == 0) || (ptr == NULL)), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid source packet");
+       image_util_debug("[Fotmat: %u] W x H : %d x %d buffer(size) : %p(%zu)", mimetype, width, height, ptr, size);
 
        ret = mm_image_create_image(width, height, __mimetype_to_image_format(mimetype), ptr, size, image);
        IMAGE_UTIL_SAFE_FREE(ptr);

diff --git a/test/image_util_testsuite.c b/test/image_util_testsuite.c
index bed1bdf..490cd58 100644 (file)
--- a/test/image_util_testsuite.c
+++ b/test/image_util_testsuite.c
@@ -1143,14 +1143,13 @@ static int __convert_image_to_packet(image_util_image_h image, media_packet_h *p
        }
 
        ret = __create_media_packet(fmt, buffer, buffer_size, packet);
-       if (ret != MEDIA_PACKET_ERROR_NONE) {
+       if (ret != MEDIA_PACKET_ERROR_NONE)
                g_print("\t__create_media_packet failed (%d)\n", ret);
-               media_format_unref(fmt);
-               SAFE_FREE(buffer);
-               return IMAGE_UTIL_ERROR_INVALID_OPERATION;
-       }
 
-       return IMAGE_UTIL_ERROR_NONE;
+       media_format_unref(fmt);
+       SAFE_FREE(buffer);
+
+       return ret;
 }
 
 static int __convert_packet_to_image(media_packet_h packet, image_util_image_h *image)
@@ -1220,8 +1219,7 @@ static int __convert_packet_to_image(media_packet_h packet, image_util_image_h *
                size += plane_size;
        }
 
-       g_print("\t[Fotmat: %u] W x H : %d x %d\n", mimetype, width, height);
-       RETVM_IF(((width <= 0) || (height <= 0) || (size == 0) || (ptr == NULL)), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid source packet");
+       g_print("\t[Fotmat: %u] W x H : %d x %d, buffer(size) : %p(%zu)\n", mimetype, width, height, ptr, size);
 
        ret = image_util_create_image(width, height, __mimetype_to_image_format(mimetype), ptr, size, image);
        SAFE_FREE(ptr);
@@ -1984,6 +1982,8 @@ static int __run_transform(test_transform_menu_e menu, test_complex_data_s *inpu
        }
 
 ERROR:
+       media_packet_destroy(mpacket);
+       media_packet_destroy(res_mpacket);
        image_util_transform_destroy(handle);
 
        return ret;
@@ -2548,7 +2548,10 @@ static void __interpret_cmd(char *cmd)
                return;
        }
 
-       __safe_atoui(cmd, &index);
+       if (__safe_atoui(cmd, &index))
+               g_print("number input! %u\n", index);
+       else
+               g_print("string input! %s\n", cmd);
 
        switch(g_current_menu) {
        /* Main menu */