diff options
| author | Elliott Hughes <enh@google.com> | 2013-10-29 15:28:08 -0700 |
|---|---|---|
| committer | Adam Lesinski <adamlesinski@google.com> | 2014-01-27 10:31:10 -0800 |
| commit | e1aa223657dd1def8609b377afa86a024bfd4e14 (patch) | |
| tree | 08607c4499d19e653f70c710c67ea59340372f84 /libs/androidfw | |
| parent | 16c4d154dca43c662571129af31b27433b919a32 (diff) | |
| download | frameworks_base-e1aa223657dd1def8609b377afa86a024bfd4e14.zip frameworks_base-e1aa223657dd1def8609b377afa86a024bfd4e14.tar.gz frameworks_base-e1aa223657dd1def8609b377afa86a024bfd4e14.tar.bz2 | |
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/androidfw')
| -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 6667daf..1f0d530 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 21e06c8..ec59f06 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)); |