commit e8626dee4272d1f0f8760929f4eb31e21375e251
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu Feb 01 03:36:16 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 01 03:36:16 2018 +0000
tree 5995c49e488e3d76d1d3fd444e7ecee69a8dcc55
parent 5b46d98a7a8eb75da9c492f987c06a2648cb87b3
parent 65c892c1727f412ab4f1ba33f7eeb90854c101ee

Merge "Merge "Revert "Revert "Make AndroidRuntime only start the debugger for zygote forked apps.""" am: 3b50dc3d34 am: 98568f57ad" into oc-mr1-dev-plus-aosp

libs/androidfw/ResourceTypes.cpp

diff --git a/libs/androidfw/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp
index 7a0ef2b..93a76ad 100644
--- a/libs/androidfw/ResourceTypes.cpp
+++ b/libs/androidfw/ResourceTypes.cpp
@@ -812,7 +812,13 @@
             *outLen = encLen;
 
             if ((uint32_t)(str+encLen-strings) < mStringPoolSize) {
-                return (const char*)str;
+                // Reject malformed (non null-terminated) strings
+                if (str[encLen] != 0x00) {
+                    ALOGW("Bad string block: string #%d is not null-terminated",
+                          (int)idx);
+                    return NULL;
+                }
+              return (const char*)str;
             } else {
                 ALOGW("Bad string block: string #%d extends to %d, past end at %d\n",
                         (int)idx, (int)(str+encLen-strings), (int)mStringPoolSize);