summaryrefslogtreecommitdiffstats
path: root/tools/aapt
diff options
context:
space:
mode:
authorChristopher R. Palmer <crpalmer@gmail.com>2015-10-29 06:04:21 -0400
committerGerrit Code Review <gerrit@cyanogenmod.org>2015-11-05 17:35:25 -0800
commitef9ef3b9e7dcaa30b5108e7a1075a7b08c4ac824 (patch)
treebf2852cd63d1b52e4c03b728520c451af410c3d4 /tools/aapt
parent0a800b2d447c6199fde95d9420df286419cf82c1 (diff)
downloadframeworks_base-ef9ef3b9e7dcaa30b5108e7a1075a7b08c4ac824.zip
frameworks_base-ef9ef3b9e7dcaa30b5108e7a1075a7b08c4ac824.tar.gz
frameworks_base-ef9ef3b9e7dcaa30b5108e7a1075a7b08c4ac824.tar.bz2
aapt: Fix compiler warning (clobbered by longjmp)
The error handling can clobber the fp variable when the code is being optimized and therefore fp must be marked as volatile to stop it from doing unsafe optimizations. Change-Id: Ib133587687c7fc0e788c4b9673669ef9b5bbe91a
Diffstat (limited to 'tools/aapt')
-rw-r--r--tools/aapt/Images.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt/Images.cpp b/tools/aapt/Images.cpp
index 2bf7e9c..6c29ad9 100644
--- a/tools/aapt/Images.cpp
+++ b/tools/aapt/Images.cpp
@@ -1438,7 +1438,7 @@ status_t preProcessImageToCache(const Bundle* bundle, const String8& source, con
png_structp read_ptr = NULL;
png_infop read_info = NULL;
- FILE* fp;
+ FILE*volatile fp;
image_info imageInfo;