diff options
| author | Nick Kralevich <nnk@google.com> | 2015-04-25 22:05:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-25 22:05:25 +0000 |
| commit | 2eb10c0075e5e23dc6868d83569a492724af3115 (patch) | |
| tree | c46f5ed5125de2e10d96efb92f2ff1fa6c85cda4 /libs/androidfw | |
| parent | 0f94fc6f1df4ef03e639190a138d650bc6cf8adf (diff) | |
| parent | 05ad674aa888e3f9217de0e5c3176161dd8e31aa (diff) | |
| download | frameworks_base-2eb10c0075e5e23dc6868d83569a492724af3115.zip frameworks_base-2eb10c0075e5e23dc6868d83569a492724af3115.tar.gz frameworks_base-2eb10c0075e5e23dc6868d83569a492724af3115.tar.bz2 | |
am 05ad674a: am 00e165ae: am e8101c04: Merge "fix compiler error under FORTIFY_SOURCE=2"
* commit '05ad674aa888e3f9217de0e5c3176161dd8e31aa':
fix compiler error under FORTIFY_SOURCE=2
Diffstat (limited to 'libs/androidfw')
| -rw-r--r-- | libs/androidfw/ObbFile.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/androidfw/ObbFile.cpp b/libs/androidfw/ObbFile.cpp index 195fa9a..95332a3 100644 --- a/libs/androidfw/ObbFile.cpp +++ b/libs/androidfw/ObbFile.cpp @@ -337,7 +337,9 @@ bool ObbFile::removeFrom(int fd) return false; } - ftruncate(fd, mFooterStart); + if (ftruncate(fd, mFooterStart) == -1) { + return false; + } return true; } |