1 files changed, 8 insertions, 0 deletions
diff --git a/tools/aapt/StringPool.cpp b/tools/aapt/StringPool.cpp
index eec23aaa93d4..e3ec0aefa2d4 100644
--- a/tools/aapt/StringPool.cpp
+++ b/tools/aapt/StringPool.cpp
@@ -38,6 +38,14 @@ void strcpy16_htod(char16_t* dst, const char16_t* src)
 
 void printStringPool(const ResStringPool* pool)
 {
+    if (pool->getError() == NO_INIT) {
+        printf("String pool is unitialized.\n");
+        return;
+    } else if (pool->getError() != NO_ERROR) {
+        printf("String pool is corrupt/invalid.\n");
+        return;
+    }
+
     SortedVector<const void*> uniqueStrings;
     const size_t N = pool->size();
     for (size_t i=0; i<N; i++) {