drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix static analyzer warnings."

Browse Source
This commit is contained in:
Treehugger Robot
2016-10-18 01:30:54 +00:00
committed by Gerrit Code Review
parent 9cff57312d e8efec56f0
commit ff5c3ad08b
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/androidfw/ResourceTypes.cpp
View File

@ -739,7 +739,7 @@ const char16_t* ResStringPool::stringAt(size_t idx, size_t* u16len) const
ALOGW("CREATING STRING CACHE OF %zu bytes", ALOGW("CREATING STRING CACHE OF %zu bytes",
static_cast<size_t>(mHeader->stringCount*sizeof(char16_t**))); static_cast<size_t>(mHeader->stringCount*sizeof(char16_t**)));
#endif #endif
mCache = (char16_t**)calloc(mHeader->stringCount, sizeof(char16_t**)); mCache = (char16_t**)calloc(mHeader->stringCount, sizeof(char16_t*));
if (mCache == NULL) { if (mCache == NULL) {
ALOGW("No memory trying to allocate decode cache table of %d bytes\n", ALOGW("No memory trying to allocate decode cache table of %d bytes\n",
(int)(mHeader->stringCount*sizeof(char16_t**))); (int)(mHeader->stringCount*sizeof(char16_t**)));
@ -4352,10 +4352,12 @@ ssize_t ResTable::getBagLocked(uint32_t resID, const bag_entry** outBag,
if (set->numAttrs >= set->availAttrs) { if (set->numAttrs >= set->availAttrs) {
// Need to alloc more memory... // Need to alloc more memory...
const size_t newAvail = set->availAttrs+N; const size_t newAvail = set->availAttrs+N;
void *oldSet = set;
set = (bag_set*)realloc(set, set = (bag_set*)realloc(set,
sizeof(bag_set) sizeof(bag_set)
+ sizeof(bag_entry)*newAvail); + sizeof(bag_entry)*newAvail);
if (set == NULL) { if (set == NULL) {
free(oldSet);
return NO_MEMORY; return NO_MEMORY;
} }
set->availAttrs = newAvail; set->availAttrs = newAvail;
@ -4402,7 +4404,7 @@ ssize_t ResTable::getBagLocked(uint32_t resID, const bag_entry** outBag,
pos++; pos++;
const size_t size = dtohs(map->value.size); const size_t size = dtohs(map->value.size);
curOff += size + sizeof(*map)-sizeof(map->value); curOff += size + sizeof(*map)-sizeof(map->value);
}; }
if (curEntry > set->numAttrs) { if (curEntry > set->numAttrs) {
set->numAttrs = curEntry; set->numAttrs = curEntry;