From f4f9bf134fe6271b3bddd79e6f9612861c546d22 Mon Sep 17 00:00:00 2001 From: hj kim Date: Thu, 18 Jun 2020 10:47:55 +0900 Subject: [PATCH] Improve __image_util_decode_read_header() Change-Id: I2c8b7395901299f1cafb29e47f933d1b9345ddec --- src/image_util_decode.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/src/image_util_decode.c b/src/image_util_decode.c index 6019314..9498652 100644 --- a/src/image_util_decode.c +++ b/src/image_util_decode.c @@ -56,26 +56,17 @@ static int __image_util_decode_read_header(const char *path, unsigned char **buf } } - read_buffer = (void *)calloc(1, IMG_HEADER_LENGTH + 1); - if (read_buffer == NULL) { - image_util_error("Allocation fail"); - fclose(fp); - fp = NULL; - return IMAGE_UTIL_ERROR_OUT_OF_MEMORY; - } + read_buffer = g_malloc0(IMG_HEADER_LENGTH + 1); if (fread(read_buffer, 1, IMG_HEADER_LENGTH, fp) != IMG_HEADER_LENGTH) { - image_util_error("File read failed"); + image_util_error("Fail to File read"); fclose(fp); - fp = NULL; - IMAGE_UTIL_SAFE_FREE(read_buffer); + g_free(read_buffer); return IMAGE_UTIL_ERROR_INVALID_OPERATION; } - *buffer = read_buffer; - fclose(fp); - fp = NULL; + *buffer = read_buffer; return IMAGE_UTIL_ERROR_NONE; } -- 2.7.4