diff options
| author | Narayan Kamath <narayan@google.com> | 2015-06-16 12:02:57 +0100 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2015-06-17 08:40:25 +0000 |
| commit | 4600dd053dbdbd4b95f3b11057a1cc55b99f9c77 (patch) | |
| tree | c4bb116de6b55b054a73083165c9512fbf21c164 /cmds/bootanimation | |
| parent | 5e063b1da52cca1b93b19bdf7be694aabf95d336 (diff) | |
| download | frameworks_base-4600dd053dbdbd4b95f3b11057a1cc55b99f9c77.zip frameworks_base-4600dd053dbdbd4b95f3b11057a1cc55b99f9c77.tar.gz frameworks_base-4600dd053dbdbd4b95f3b11057a1cc55b99f9c77.tar.bz2 | |
ZipFileRO: Use precise widths for zip file types.
getEntryInfo crashes on 64-bit devices because "long" types
were being passed int pointers (that pointed to a stack frame)
that were reinterpret_cast'ed to long* (sigh.). To fix this issue
once and for all, use types with explicitly defined widths.
This change also removes some dead invariant checking from
Asset.cpp instead of cleaning it up.
Note that we've introduced a wart in NativeLibraryHelper, where
we need to deal with zlib's uLong type, which is "at least 32 bits
wide".
bug: 21622286
Change-Id: Iae675a9601db7aae03a8b80b40321d2cc1d97f50
Diffstat (limited to 'cmds/bootanimation')
| -rw-r--r-- | cmds/bootanimation/BootAnimation.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp index 21dc1e2..fba462b 100644 --- a/cmds/bootanimation/BootAnimation.cpp +++ b/cmds/bootanimation/BootAnimation.cpp @@ -530,7 +530,7 @@ bool BootAnimation::movie() if (leaf.size() > 0) { for (size_t j=0 ; j<pcount ; j++) { if (path == animation.parts[j].path) { - int method; + uint16_t method; // supports only stored png files if (mZip->getEntryInfo(entry, &method, NULL, NULL, NULL, NULL, NULL)) { if (method == ZipFileRO::kCompressStored) { |