raster pushed a commit to branch master.

commit d12b6e6fa171e1ce4e77a460a402d7150344677f
Author: Carsten Haitzler (Rasterman) <[email protected]>
Date:   Tue Jul 16 18:20:07 2013 +0900

    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 2e903ee..f871944 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;
 }
 

-- 

------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk

Reply via email to