summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Nick Kralevich <nnk@google.com> 2015-04-25 21:41:52 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-04-25 21:41:52 +0000
commit00e165aed3d53b147b153003b3b9fd3c129ff3c4 (patch)
treefd6cc8a8a1b76cb81e158ce08d0f4837ba74e21e
parentd639a4532417bf605f03b3b5efdb3a9e1cbe6661 (diff)
parente8101c047cffc69245493d96f2f2ec36728682f1 (diff)
am e8101c04: Merge "fix compiler error under FORTIFY_SOURCE=2"
* commit 'e8101c047cffc69245493d96f2f2ec36728682f1': fix compiler error under FORTIFY_SOURCE=2
-rw-r--r--libs/androidfw/ObbFile.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/androidfw/ObbFile.cpp b/libs/androidfw/ObbFile.cpp
index 195fa9ac00d3..95332a35eb7d 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;
}