Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* changes:
  [automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008 am: fd1097e436 am: 5a632d1b59 am: 6714a260e6 am: 3a272fe404 am: 3926163983 am: ad43c89030 am: a659d7c233 am: c51c6751d7
  [automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008 am: fd1097e436 am: 5a632d1b59 am: 6714a260e6 am: 3a272fe404 am: 3926163983 am: ad43c89030 am: a659d7c233
  [automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008 am: fd1097e436 am: 5a632d1b59 am: 6714a260e6 am: 3a272fe404 am: 3926163983 am: ad43c89030
  [automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008 am: fd1097e436 am: 5a632d1b59 am: 6714a260e6 am: 3a272fe404 am: 3926163983
  [automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008 am: fd1097e436 am: 5a632d1b59 am: 6714a260e6 am: 3a272fe404
  [automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008 am: fd1097e436 am: 5a632d1b59 am: 6714a260e6
  [automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008 am: fd1097e436 am: 5a632d1b59
  [automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008 am: fd1097e436
  [automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008
  ResStringPool: Prevenet boot loop from se fix
This commit is contained in:
TreeHugger Robot
2018-06-06 22:09:54 +00:00
committed by Android (Google) Code Review
parent ce1d540693 e06bd99d4c
commit 075bcf73c8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/androidfw/ResourceTypes.cpp
View File

@@ -459,7 +459,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. // The chunk must be at least the size of the string pool header.
if (size < sizeof(ResStringPool_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); return (mError=BAD_TYPE);
} }
@@ -469,7 +469,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), if (validate_chunk(reinterpret_cast<const ResChunk_header*>(data), sizeof(ResStringPool_header),
reinterpret_cast<const uint8_t*>(data) + size, reinterpret_cast<const uint8_t*>(data) + size,
"ResStringPool_header") != NO_ERROR) { "ResStringPool_header") != NO_ERROR) {
LOG_ALWAYS_FATAL("Bad string block: malformed block dimensions"); ALOGW("Bad string block: malformed block dimensions");
return (mError=BAD_TYPE); return (mError=BAD_TYPE);
} }