From cf483d2e13428710c97d73043125ebecb1958cbc Mon Sep 17 00:00:00 2001 From: "JesusFreke@JesusFreke.com" Date: Fri, 21 Aug 2009 06:54:12 +0000 Subject: [PATCH] - Remove duplicate annotation of the padding - fix the calculation of the encoded handlers size, based on the presence or absence of the catch all handler git-svn-id: https://smali.googlecode.com/svn/trunk@400 55b6fa8a-2a1e-11de-a435-ffa8d773f76a --- dexlib/src/main/java/org/jf/dexlib/CodeItem.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dexlib/src/main/java/org/jf/dexlib/CodeItem.java b/dexlib/src/main/java/org/jf/dexlib/CodeItem.java index 10250abe..7a4583ab 100644 --- a/dexlib/src/main/java/org/jf/dexlib/CodeItem.java +++ b/dexlib/src/main/java/org/jf/dexlib/CodeItem.java @@ -228,9 +228,6 @@ public class CodeItem extends Item { "fill_array_data instruction"); } }); - if (tries != null && (tries.length % 2 == 1)) { - out.annotate(2, "padding"); - } } out.writeShort(registerCount); @@ -520,7 +517,7 @@ public class CodeItem extends Item { out.annotate("size: 0x" + Integer.toHexString(handlers.length) + " (" + handlers.length + ")"); int size = handlers.length; - if (catchAllHandlerAddress < 0) { + if (catchAllHandlerAddress > -1) { size = size * -1; } out.writeSignedLeb128(size); @@ -539,7 +536,7 @@ public class CodeItem extends Item { } } else { int size = handlers.length; - if (catchAllHandlerAddress < 0) { + if (catchAllHandlerAddress > -1) { size = size * -1; } out.writeSignedLeb128(size);