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

Re-apply androidfw fixes lost by the directory rearrangement.

Browse Source 
Assignment to wrong variable in libs/androidfw/AssetManager.cpp.
https://code.google.com/p/android/issues/detail?id=61560

Missing delete[]s in libs/androidfw/ObbFile.cpp.
https://code.google.com/p/android/issues/detail?id=61549

Change-Id: I24e6867284d70a7793d78e62d1a836cbee310fb0
This commit is contained in:
Elliott Hughes
2013-10-29 15:28:08 -07:00
committed by Adam Lesinski
parent 16c4d154dc
commit e1aa223657
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/androidfw/AssetManager.cpp
View File

@@ -689,7 +689,7 @@ const ResTable* AssetManager::getResTable(bool required) const
}
} else {
ALOGV("loading resource table %s\n", ap.path.string());
Asset* ass = const_cast<AssetManager*>(this)->
ass = const_cast<AssetManager*>(this)->
openNonAssetInPathLocked("resources.arsc",
Asset::ACCESS_BUFFER,
ap);

2
libs/androidfw/ObbFile.cpp
View File

@@ -133,7 +133,7 @@ bool ObbFile::parseObbFile(int fd)
{
lseek64(fd, fileLength - kFooterTagSize, SEEK_SET);
char *footer = new char[kFooterTagSize];
char footer[kFooterTagSize];
actual = TEMP_FAILURE_RETRY(read(fd, footer, kFooterTagSize));
if (actual != kFooterTagSize) {
ALOGW("couldn't read footer signature: %s\n", strerror(errno));