commit 3bf6389120a3f43d333b29f471518887f1c12c10
author Andreas Gampe <agampe@google.com> Fri Apr 28 13:51:39 2017 -0700
committer Andreas Gampe <agampe@google.com> Fri Apr 28 13:51:39 2017 -0700
tree c0487d978231d7cf6378b51a1d844ed1dc208efa
parent 763ff42a69852db478815087066a5327200ad477

Aapt2: Fix png leak

do9Patch is leaking two rows of data.

Bug: 37782695
Test: ASAN_OPTIONS= SANITIZE_HOST=address m
Change-Id: Ibd2198919cd9c24f2de9f50b23c87753f2190708

tools/aapt2/compile/Png.cpp

diff --git a/tools/aapt2/compile/Png.cpp b/tools/aapt2/compile/Png.cpp
index bbf7f41..65c4eb8 100644
--- a/tools/aapt2/compile/Png.cpp
+++ b/tools/aapt2/compile/Png.cpp
@@ -1080,6 +1080,10 @@
         newRows[i] = image->rows[i + 1];
         memmove(newRows[i], newRows[i] + 4, (W - 2) * 4);
     }
+    delete[] image->rows[0];
+    if (H - 1 > 0) {
+      delete[] image->rows[H - 1];
+    }
     image->rows.swap(newRows);
 
     image->width -= 2;