| commit | e1aa223657dd1def8609b377afa86a024bfd4e14 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Oct 29 15:28:08 2013 -0700 |
| committer | Adam Lesinski <adamlesinski@google.com> | Mon Jan 27 10:31:10 2014 -0800 |
| tree | 08607c4499d19e653f70c710c67ea59340372f84 | |
| parent | 16c4d154dca43c662571129af31b27433b919a32 [diff] [blame] |
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
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 @@ { 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));