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

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

Merge changes from topic "am-c1e91e5e-2686-4871-b188-107c0ddf3273" into mnc-dr-dev 

* changes:
  [automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf800
  ResStringPool: Prevenet boot loop from se fix
parents 5b224ccf fd1097e4

libs/androidfw/ResourceTypes.cpp

+2 −2
Original line number Diff line number Diff line
@@ -457,7 +457,7 @@ status_t ResStringPool::setTo(const void* data, size_t size, bool copyData) 


    // The chunk must be at least the size of the string pool header.

    if (size < sizeof(ResStringPool_header)) {

        LOG_ALWAYS_FATAL("Bad string block: data size %zu is too small to be a string block", size);

        ALOGW("Bad string block: data size %zu is too small to be a string block", size);

        return (mError=BAD_TYPE);

    }
@@ -467,7 +467,7 @@ status_t ResStringPool::setTo(const void* data, size_t size, bool copyData) 
    if (validate_chunk(reinterpret_cast<const ResChunk_header*>(data), sizeof(ResStringPool_header),

                       reinterpret_cast<const uint8_t*>(data) + size,

                       "ResStringPool_header") != NO_ERROR) {

        LOG_ALWAYS_FATAL("Bad string block: malformed block dimensions");

        ALOGW("Bad string block: malformed block dimensions");

        return (mError=BAD_TYPE);

    }