summaryrefslogtreecommitdiffstats
path: root/dx/src/com/android/dx
diff options
context:
space:
mode:
authorJesse Wilson <jessewilson@google.com>2011-12-13 13:49:50 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-12-13 13:49:50 -0800
commit2797a6d4c7c14c574661414fd448bafcbf4d4ac5 (patch)
tree59e2548b6723cdfc1cec47eb2cf9f43a27cf92c7 /dx/src/com/android/dx
parentfe81f65203d40da10cf1d6863428159457f1204b (diff)
parent2cdb0f99380a09f494977d1799e21e2a79d40a65 (diff)
downloadandroid_dalvik-2797a6d4c7c14c574661414fd448bafcbf4d4ac5.tar.gz
android_dalvik-2797a6d4c7c14c574661414fd448bafcbf4d4ac5.tar.bz2
android_dalvik-2797a6d4c7c14c574661414fd448bafcbf4d4ac5.zip
Merge "Don't throw an AssertionError on invalid input."
Diffstat (limited to 'dx/src/com/android/dx')
-rw-r--r--dx/src/com/android/dx/io/instructions/DecodedInstruction.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/dx/src/com/android/dx/io/instructions/DecodedInstruction.java b/dx/src/com/android/dx/io/instructions/DecodedInstruction.java
index e418a1c0b..9d9e88e08 100644
--- a/dx/src/com/android/dx/io/instructions/DecodedInstruction.java
+++ b/dx/src/com/android/dx/io/instructions/DecodedInstruction.java
@@ -21,7 +21,6 @@ import com.android.dx.io.OpcodeInfo;
import com.android.dx.io.Opcodes;
import com.android.dx.util.DexException;
import com.android.dx.util.Hex;
-
import java.io.EOFException;
/**
@@ -90,7 +89,7 @@ public abstract class DecodedInstruction {
decoded[in.cursor()] = DecodedInstruction.decode(in);
}
} catch (EOFException ex) {
- throw new AssertionError("shouldn't happen");
+ throw new DexException(ex);
}
return decoded;