Fix to check valid pointer before using 'combine_image'

Change-Id: I8d56b508c98f0cfbd6d2770af9fa901272ef1037

diff --git a/packaging/libheif.spec b/packaging/libheif.spec
index 3cb496d..70bbb1f 100644 (file)
--- a/packaging/libheif.spec
+++ b/packaging/libheif.spec
@@ -1,6 +1,6 @@
 Name:       libheif
 Summary:    Multimedia Framework Library for HEIF(ISO/IEC 23008-12) image
-Version:    0.0.3
+Version:    0.0.4
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0

diff --git a/src/heif_decoder.c b/src/heif_decoder.c
index 1ba5684..84df26d 100644 (file)
--- a/src/heif_decoder.c
+++ b/src/heif_decoder.c
@@ -259,9 +259,9 @@ static int __combine_rgb(heif_image_t *tile_image, unsigned int pos_x, unsigned
        unsigned char *ptr_src = NULL, *ptr_dst = NULL;
 
        heif_retvm_if_failed(__is_valid_heif_image(tile_image), LIBHEIF_ERROR_INVALID_PARAMETER, "invalid tile_image");
+       heif_retvm_if_failed(__is_valid_heif_image(combine_image), LIBHEIF_ERROR_INVALID_PARAMETER, "invalid combine_image");
        heif_retvm_if_failed(pos_x < combine_image->width, LIBHEIF_ERROR_INVALID_PARAMETER, "invalid pos_x %u", pos_x);
        heif_retvm_if_failed(pos_y < combine_image->height, LIBHEIF_ERROR_INVALID_PARAMETER, "invalid pos_y %u", pos_y);
-       heif_retvm_if_failed(__is_valid_heif_image(combine_image), LIBHEIF_ERROR_INVALID_PARAMETER, "invalid combine_image");
 
        switch (tile_image->format) {
        case HEIF_COLOR_FORMAT_RGB24:
@@ -343,9 +343,9 @@ static int __combine_yuv(heif_image_t *tile_image, unsigned int pos_x, unsigned
        unsigned char *ptr_src[3] = { NULL, }, *ptr_dst[3] = { NULL, }; // y = 0, u = 1, v =2
 
        heif_retvm_if_failed(__is_valid_heif_image(tile_image), LIBHEIF_ERROR_INVALID_PARAMETER, "invalid tile_image");
+       heif_retvm_if_failed(__is_valid_heif_image(combine_image), LIBHEIF_ERROR_INVALID_PARAMETER, "invalid combine_image");
        heif_retvm_if_failed(pos_x < combine_image->width, LIBHEIF_ERROR_INVALID_PARAMETER, "invalid pos_x %u", pos_x);
        heif_retvm_if_failed(pos_y < combine_image->height, LIBHEIF_ERROR_INVALID_PARAMETER, "invalid pos_y %u", pos_y);
-       heif_retvm_if_failed(__is_valid_heif_image(combine_image), LIBHEIF_ERROR_INVALID_PARAMETER, "invalid combine_image");
 
        switch (tile_image->format) {
        case HEIF_COLOR_FORMAT_YUV420P:

diff --git a/test/test.sh b/test/test.sh
index 7d0dc9a..a5de2eb 100755 (executable)
--- a/test/test.sh
+++ b/test/test.sh
@@ -18,7 +18,7 @@
 
 @echo off
 # VERSION should be same with library version.
-VERSION=0.0.3
+VERSION=0.0.4
 ARM=armv7l
 X86=i586
 AARCH64=aarch64