From 47af988a7cd0ffc2de17fcd292a5b945d584b386 Mon Sep 17 00:00:00 2001 From: hj kim Date: Thu, 18 Oct 2018 10:51:22 +0900 Subject: [PATCH 1/1] Check input parameter Change-Id: I075c1dd9f96234cfa33263a2ffbcb47fe17fb9d4 --- include/image_util_private.h | 2 +- src/image_util.c | 1 + src/image_util_encode.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/image_util_private.h b/include/image_util_private.h index dce2845..1ff6168 100755 --- a/include/image_util_private.h +++ b/include/image_util_private.h @@ -173,7 +173,7 @@ typedef struct { } decode_s; #define IMAGE_UTIL_TYPE_CHECK(type) \ - image_util_retvm_if((type < IMAGE_UTIL_JPEG || type > IMAGE_UTIL_BMP), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid parameter") + image_util_retvm_if((type < IMAGE_UTIL_JPEG || type > IMAGE_UTIL_BMP), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid image type [%d]", type) #define IMAGE_UTIL_SUPPORT_TYPE_CHECK(value, support) \ image_util_retvm_if((value != support), IMAGE_UTIL_ERROR_NOT_SUPPORTED_FORMAT, "Not supported format") diff --git a/src/image_util.c b/src/image_util.c index 109e2eb..510f251 100755 --- a/src/image_util.c +++ b/src/image_util.c @@ -506,6 +506,7 @@ int image_util_transform_set_colorspace(transformation_h handle, image_util_colo image_util_debug("Set colorspace_convert_info [%d]", colorspace); image_util_retvm_if((_handle == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid Handle"); + image_util_retvm_if((is_valid_colorspace(colorspace) == FALSE), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid colorspace"); _handle->dst_format = colorspace; _handle->set_convert = true; diff --git a/src/image_util_encode.c b/src/image_util_encode.c index 5cc3cb4..1356973 100755 --- a/src/image_util_encode.c +++ b/src/image_util_encode.c @@ -76,7 +76,7 @@ int image_util_encode_create(image_util_type_e image_type, image_util_encode_h * image_util_fenter(); image_util_retvm_if(handle == NULL, IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid handle"); - image_util_retvm_if((image_type < IMAGE_UTIL_JPEG) || (image_type > IMAGE_UTIL_BMP), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid image_type [%d]", image_type); + IMAGE_UTIL_TYPE_CHECK(image_type); encode_s *_handle = (encode_s *) calloc(1, sizeof(encode_s)); image_util_retvm_if((_handle == NULL), IMAGE_UTIL_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); -- 2.7.4