diff options
| author | 2013-10-29 15:28:08 -0700 | |
|---|---|---|
| committer | 2013-10-29 15:28:08 -0700 | |
| commit | 26609e2c306e7f15c15d047d639889f830f5d1b5 (patch) | |
| tree | d69b1c47a7b0b0247de72d76bd17519770eaa6f3 /libs | |
| parent | 3d0c7797acd4d3973a0a6c0513400f7909df0407 (diff) | |
Re-apply androidfw fixes lost by the directory rearrangement.
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
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/androidfw/AssetManager.cpp | 2 | ||||
| -rw-r--r-- | libs/androidfw/ObbFile.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libs/androidfw/AssetManager.cpp b/libs/androidfw/AssetManager.cpp index 6667dafe45..1f0d5309f2 100644 --- a/libs/androidfw/AssetManager.cpp +++ b/libs/androidfw/AssetManager.cpp @@ -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); diff --git a/libs/androidfw/ObbFile.cpp b/libs/androidfw/ObbFile.cpp index 21e06c8db5..ec59f0666c 100644 --- a/libs/androidfw/ObbFile.cpp +++ b/libs/androidfw/ObbFile.cpp @@ -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)); |