From d12b6e6fa171e1ce4e77a460a402d7150344677f Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Tue, 16 Jul 2013 18:20:07 +0900 Subject: [PATCH] fix clang bad free complaint --- src/lib/eet/eet_image.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/lib/eet/eet_image.c b/src/lib/eet/eet_image.c index 2e903ee8ea..f8719443f5 100644 --- a/src/lib/eet/eet_image.c +++ b/src/lib/eet/eet_image.c @@ -1399,8 +1399,10 @@ eet_data_image_header_decode_cipher(const void *data, size = deciphered_sz; } else - if (deciphered_d) - free(deciphered_d); + { + free(deciphered_d); + deciphered_d = NULL; + } } if (_eet_image_words_bigendian == -1) @@ -1416,7 +1418,7 @@ eet_data_image_header_decode_cipher(const void *data, if (size < 32) { - if (deciphered_d) free(deciphered_d); + free(deciphered_d); return 0; } @@ -1438,13 +1440,13 @@ eet_data_image_header_decode_cipher(const void *data, cp = header[4]; if ((iw < 1) || (ih < 1) || (iw > 8192) || (ih > 8192)) { - if (deciphered_d) free(deciphered_d); + free(deciphered_d); return 0; } if ((cp == 0) && (size < ((iw * ih * 4) + 32))) { - if (deciphered_d) free(deciphered_d); + free(deciphered_d); return 0; } @@ -1533,7 +1535,7 @@ eet_data_image_header_decode_cipher(const void *data, } } - if (deciphered_d) free(deciphered_d); + free(deciphered_d); return 0; }