commit 5786491706cc44f2c5fd7a01b80fa7df19493a2d
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Wed Jan 17 22:20:55 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Wed Jan 17 22:20:55 2018 +0000
tree 3366c73c54269c0ddedb36432ebfb6f31009a73c
parent 0a1948e51509fb5407ee34b855e4ee140ac64dbe
parent afac0f46d978df65a52773134234542dc51af583

[automerger] Check for null-terminator in ResStringPool::string8At am: 5ec65ae909 am: c3d7250b99 am: e2417e6682 am: 0ab4540c41 am: a3f0976937 am: 166aa6e149 am: b7f7f7e14e am: c26b8635b7 am: afac0f46d9

Change-Id: I929d36bb57eb15b520d67580a3372b960ecd2495

libs/androidfw/ResourceTypes.cpp

diff --git a/libs/androidfw/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp
index ceeb12b..7cb4216 100644
--- a/libs/androidfw/ResourceTypes.cpp
+++ b/libs/androidfw/ResourceTypes.cpp
@@ -807,7 +807,13 @@
             *outLen = decodeLength(&str);
             size_t encLen = decodeLength(&str);
             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);