Add finishing jpeg decompression due to memory leak

 - The libjpeg release memory without stdio manager during compression
   So we should finish decompression before release jpeg source.
   If release jpeg decompression without finishing, jpeg_destroy_decompress makes memory leak.

Change-Id: Ic19ea9935edc0c461c7dcfad7670cd551f0525cc
Signed-off-by: Jiyong Min <jiyong.min@samsung.com>

diff --git a/jpeg/mm_util_jpeg.c b/jpeg/mm_util_jpeg.c
index 8886a35948a090225e30e5f43281eba2ce944109..95fc0801eab7071fc3e192f6f98552e2208c3cbb 100755 (executable)
--- a/jpeg/mm_util_jpeg.c
+++ b/jpeg/mm_util_jpeg.c
@@ -997,6 +997,7 @@ static int __mm_image_decode_from_jpeg_file_with_libjpeg(mm_util_jpeg_yuv_data *
        } else if (input_fmt == MM_UTIL_JPEG_FMT_GraySacle) {
                decoded_data->size = dinfo.output_height * dinfo.output_width;
        } else{
+               jpeg_finish_decompress(&dinfo);
                jpeg_destroy_decompress(&dinfo);
                mm_util_error("[%d] We can't decode the IMAGE format", input_fmt);
                fclose(infile);
@@ -1007,6 +1008,7 @@ static int __mm_image_decode_from_jpeg_file_with_libjpeg(mm_util_jpeg_yuv_data *
        decoded_data->format = input_fmt;
 
        if (decoded_data->data == NULL) {
+               jpeg_finish_decompress(&dinfo);
                jpeg_destroy_decompress(&dinfo);
                mm_util_error("decoded_data->data is NULL");
                fclose(infile);
@@ -1180,6 +1182,7 @@ static int __mm_image_decode_from_jpeg_memory_with_libjpeg(mm_util_jpeg_yuv_data
        } else if (input_fmt == MM_UTIL_JPEG_FMT_GraySacle) {
                decoded_data->size = dinfo.output_height * dinfo.output_width;
        } else{
+               jpeg_finish_decompress(&dinfo);
                jpeg_destroy_decompress(&dinfo);
                mm_util_error("[%d] We can't decode the IMAGE format", input_fmt);
                return MM_UTIL_ERROR_NOT_SUPPORTED_FORMAT;
@@ -1189,6 +1192,7 @@ static int __mm_image_decode_from_jpeg_memory_with_libjpeg(mm_util_jpeg_yuv_data
        decoded_data->format = input_fmt;
 
        if (decoded_data->data == NULL) {
+               jpeg_finish_decompress(&dinfo);
                jpeg_destroy_decompress(&dinfo);
                mm_util_error("decoded_data->data is NULL");
                return MM_UTIL_ERROR_OUT_OF_MEMORY;

diff --git a/packaging/libmm-utility.spec b/packaging/libmm-utility.spec
index 65cb04186dd3be0f4aef8eb6a6d1ce013e8a73e4..ef928721ff0a60ecdcd1e78302fc50d2184e09f0 100755 (executable)
--- a/packaging/libmm-utility.spec
+++ b/packaging/libmm-utility.spec
@@ -1,6 +1,6 @@
 Name:       libmm-utility
 Summary:    Multimedia Framework Utility Library
-Version:    0.40
+Version:    0.41
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0