From e8efec56f01983b98fbc4a1075a9e168b1fe1e9d Mon Sep 17 00:00:00 2001 From: George Burgess IV Date: Tue, 11 Oct 2016 15:42:29 -0700 Subject: Fix static analyzer warnings. frameworks/base/libs/androidfw/ResourceTypes.cpp:742:46: warning: Result of 'calloc' is converted to a pointer of type 'char16_t *', which is incompatible with sizeof operand type 'char16_t **' mCache = (char16_t**)calloc(mHeader->stringCount, sizeof(char16_t**)); frameworks/base/libs/androidfw/ResourceTypes.cpp:4359:28: warning: Potential leak of memory pointed to by 'set' return NO_MEMORY; Bug: None Test: Builds without the aforementioned warnings. Change-Id: I1f84c1b9f4cba05f5cc7c3ae9fec1a07bc9cd8fe --- libs/androidfw/ResourceTypes.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libs/androidfw/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp index c91b27d04778..10a0a23392b3 100644 --- a/libs/androidfw/ResourceTypes.cpp +++ b/libs/androidfw/ResourceTypes.cpp @@ -739,7 +739,7 @@ const char16_t* ResStringPool::stringAt(size_t idx, size_t* u16len) const ALOGW("CREATING STRING CACHE OF %zu bytes", static_cast(mHeader->stringCount*sizeof(char16_t**))); #endif - mCache = (char16_t**)calloc(mHeader->stringCount, sizeof(char16_t**)); + mCache = (char16_t**)calloc(mHeader->stringCount, sizeof(char16_t*)); if (mCache == NULL) { ALOGW("No memory trying to allocate decode cache table of %d bytes\n", (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) { // Need to alloc more memory... const size_t newAvail = set->availAttrs+N; + void *oldSet = set; set = (bag_set*)realloc(set, sizeof(bag_set) + sizeof(bag_entry)*newAvail); if (set == NULL) { + free(oldSet); return NO_MEMORY; } set->availAttrs = newAvail; @@ -4402,7 +4404,7 @@ ssize_t ResTable::getBagLocked(uint32_t resID, const bag_entry** outBag, pos++; const size_t size = dtohs(map->value.size); curOff += size + sizeof(*map)-sizeof(map->value); - }; + } if (curEntry > set->numAttrs) { set->numAttrs = curEntry; -- cgit v1.2.3-59-g8ed1b