Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46fc48f5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-1ab9514f-fd12-4093-b1cb-a77e9f0419c9" into oc-dev 

* changes:
  [automerger] Check for null-terminator in ResStringPool::string8At am: 5ec65ae9 am: c3d7250b am: e2417e66 am: 0ab4540c am: a3f09769 am: 166aa6e1 am: b7f7f7e1 am: c26b8635 am: afac0f46 am: 57864917
  [automerger] Check for null-terminator in ResStringPool::string8At am: 5ec65ae9 am: c3d7250b am: e2417e66 am: 0ab4540c am: a3f09769 am: 166aa6e1 am: b7f7f7e1 am: c26b8635 am: afac0f46
  [automerger] Check for null-terminator in ResStringPool::string8At am: 5ec65ae9 am: c3d7250b am: e2417e66 am: 0ab4540c am: a3f09769 am: 166aa6e1 am: b7f7f7e1 am: c26b8635
  [automerger] Check for null-terminator in ResStringPool::string8At am: 5ec65ae9 am: c3d7250b am: e2417e66 am: 0ab4540c am: a3f09769 am: 166aa6e1 am: b7f7f7e1
  [automerger] Check for null-terminator in ResStringPool::string8At am: 5ec65ae9 am: c3d7250b am: e2417e66 am: 0ab4540c am: a3f09769 am: 166aa6e1
  [automerger] Check for null-terminator in ResStringPool::string8At am: 5ec65ae9 am: c3d7250b am: e2417e66 am: 0ab4540c am: a3f09769
  [automerger] Check for null-terminator in ResStringPool::string8At am: 5ec65ae9 am: c3d7250b am: e2417e66 am: 0ab4540c
  [automerger] Check for null-terminator in ResStringPool::string8At am: 5ec65ae9 am: c3d7250b am: e2417e66
  [automerger] Check for null-terminator in ResStringPool::string8At am: 5ec65ae9 am: c3d7250b
  [automerger] Check for null-terminator in ResStringPool::string8At am: 5ec65ae9
  Check for null-terminator in ResStringPool::string8At
parents 5f7cdba8 163548ed

libs/androidfw/ResourceTypes.cpp

+7 −1
Original line number Diff line number Diff line
@@ -813,6 +813,12 @@ const char* ResStringPool::string8At(size_t idx, size_t* outLen) const 
            *outLen = encLen;



            if ((uint32_t)(str+encLen-strings) < mStringPoolSize) {

                // 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",