summaryrefslogtreecommitdiffstats
path: root/libdex/DexSwapVerify.cpp
diff options
context:
space:
mode:
authorSangWook Han <sangwook.han@gmail.com>2012-07-15 22:42:28 +0900
committerElliott Hughes <enh@google.com>2012-07-18 17:13:24 -0700
commitb210a9f9c7ae17e2028a86d9a4e9a3b35472862a (patch)
treed6d5fc91ee67d127e63223782ad10bdf7b4af3ed /libdex/DexSwapVerify.cpp
parentfd9491c5ea82e91d0085679caa82195bb5b4d17b (diff)
downloadandroid_dalvik-b210a9f9c7ae17e2028a86d9a4e9a3b35472862a.tar.gz
android_dalvik-b210a9f9c7ae17e2028a86d9a4e9a3b35472862a.tar.bz2
android_dalvik-b210a9f9c7ae17e2028a86d9a4e9a3b35472862a.zip
Use uintptr_t for cast pointer to integer.
On 64bit host, sizeof pointer is not equal to sizeof int/u4. Need for host tools. Change-Id: Id8d9418787e79523226b9c9e3f67277f9ac7c6aa
Diffstat (limited to 'libdex/DexSwapVerify.cpp')
-rw-r--r--libdex/DexSwapVerify.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libdex/DexSwapVerify.cpp b/libdex/DexSwapVerify.cpp
index 1835e9ba9..24a86f9ba 100644
--- a/libdex/DexSwapVerify.cpp
+++ b/libdex/DexSwapVerify.cpp
@@ -1842,7 +1842,7 @@ static void* swapCodeItem(const CheckState* state, void* ptr) {
if (item->triesSize == 0) {
ptr = insns;
} else {
- if ((((u4) insns) & 3) != 0) {
+ if ((((uintptr_t) insns) & 3) != 0) {
// Four-byte alignment for the tries. Verify the spacer is a 0.
if (*insns != 0) {
ALOGE("Non-zero padding: %#x", (u4) *insns);