commit 6a1fadea851db236331b3dfe1f3c1e482556057f
author Marco Nelissen Mon Apr 20 16:16:01 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Mon Apr 20 16:16:01 2009 -0700
tree ec5174266cd02bb0010ca51d687a20ba7d3a3b38
parent e38e90bf222515538281cc73c5e4a9f3c269c875

AI 147028: Fix up aapt so it runs cleanly under the valgrind leak checker.

Automated import of CL 147028

tools/aapt/Images.cpp

diff --git a/tools/aapt/Images.cpp b/tools/aapt/Images.cpp
index 0a4c68b..f2414dd 100644
--- a/tools/aapt/Images.cpp
+++ b/tools/aapt/Images.cpp
@@ -44,6 +44,9 @@
             }
             free(allocRows);
         }
+        free(info9Patch.xDivs);
+        free(info9Patch.yDivs);
+        free(info9Patch.colors);
     }
 
     png_uint_32 width;
@@ -833,6 +836,7 @@
     int i;
 
     png_unknown_chunk unknowns[1];
+    unknowns[0].data = NULL;
 
     png_bytepp outRows = (png_bytepp) malloc((int) imageInfo.height * png_sizeof(png_bytep));
     if (outRows == (png_bytepp) 0) {
@@ -939,6 +943,7 @@
         free(outRows[i]);
     }
     free(outRows);
+    free(unknowns[0].data);
 
     png_get_IHDR(write_ptr, write_info, &width, &height,
        &bit_depth, &color_type, &interlace_type,