commit 25e9d55e964c180ec6e57ba1d977d6c2e1115f5a
author Adam Lesinski <adamlesinski@google.com> Mon May 19 15:01:43 2014 -0700
committer Adam Lesinski <adamlesinski@google.com> Mon May 19 15:01:43 2014 -0700
tree bc25629c89459c5b2775f723174a9c5da69a0eb2
parent 605a07be7bdda0fd0f8aa4ff18e1769e298663e0

Don't dump data from a bad ResTable

AAPT dumps data from a bad ResTable, which
causes crashes. Prevent this by checking if
there were errors when creating the ResTable.

Bug:14902008
Change-Id: I5e04ebf967c60b78c511dd175785a13bca52f09a

tools/aapt/Command.cpp

diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp
index 4e0a9fe..cc0da15 100644
--- a/tools/aapt/Command.cpp
+++ b/tools/aapt/Command.cpp
@@ -634,6 +634,9 @@
     if (&res == NULL) {
         fprintf(stderr, "ERROR: dump failed because no resource table was found\n");
         goto bail;
+    } else if (res.getError() != NO_ERROR) {
+        fprintf(stderr, "ERROR: dump failed because the resource table is invalid/corrupt.\n");
+        goto bail;
     }
 
     if (strcmp("resources", option) == 0) {