Move IMG_HEADER_LENGTH to use commonly and check minimum size of input buffer

Change-Id: Ie046834a43d361bbcf9d7d4a4432c90c6e07f899

diff --git a/src/image_util_decode.c b/src/image_util_decode.c
index 0e93a0ced9beeb17eae33ca8ab4842a509f15ffa..4b0aabc2fc7aced94fedf286c97e12868b6d38ef 100644 (file)
--- a/src/image_util_decode.c
+++ b/src/image_util_decode.c
@@ -34,11 +34,10 @@ static int _convert_decode_scale_tbl[] = {
 
 #define _NUM_OF_SCALE                  (sizeof(_convert_decode_scale_tbl)/sizeof(int))
 #define _NOT_SUPPORTED_IMAGE_TYPE (-1)
+#define IMG_HEADER_LENGTH 8
 
 static int _image_util_decode_read_header(const char *path, unsigned char **buffer)
 {
-#define IMG_HEADER_LENGTH 8
-
        FILE *fp = NULL;
        unsigned char *read_buffer = NULL;
 
@@ -200,7 +199,7 @@ int image_util_decode_set_input_buffer(image_util_decode_h handle, const unsigne
        decode_encode_s *_handle = (decode_encode_s *) handle;
 
        IMAGE_UTIL_DECODE_HANDLE_CHECK(handle);
-       image_util_retvm_if((src_buffer == NULL || src_size == 0), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid input buffer");
+       image_util_retvm_if((src_buffer == NULL || src_size < IMG_HEADER_LENGTH), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid input buffer");
 
        IMAGE_UTIL_SAFE_FREE(_handle->path);