summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYing Wang <wangying@android.com>2016-01-21 23:36:15 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2016-01-21 23:36:15 +0000
commitb29a267e02f80873fa1697989112e2500c432e44 (patch)
tree4703572039bbc91618a4e285711786721fd29e69
parentef2942809b198653e0cf181151a5f435f5bb7476 (diff)
parent9323689e53509aa4b0f2cdee861dd984a8f418e9 (diff)
downloadproguard-b29a267e02f80873fa1697989112e2500c432e44.tar.gz
Merge "Fix 'Exception in thread "main" java.lang.AbstractMethodError:'"
-rw-r--r--lib/proguard.jarbin853203 -> 806163 bytes
-rw-r--r--lib/proguardgui.jarbin139582 -> 137002 bytes
-rw-r--r--lib/retrace.jarbin6973 -> 7556 bytes
-rw-r--r--src/proguard/obfuscate/MappingPrinter.java16
4 files changed, 14 insertions, 2 deletions
diff --git a/lib/proguard.jar b/lib/proguard.jar
index a948c89..43faf48 100644
--- a/lib/proguard.jar
+++ b/lib/proguard.jar
Binary files differ
diff --git a/lib/proguardgui.jar b/lib/proguardgui.jar
index b876e89..e2d9439 100644
--- a/lib/proguardgui.jar
+++ b/lib/proguardgui.jar
Binary files differ
diff --git a/lib/retrace.jar b/lib/retrace.jar
index c00fbe7..94c8c6b 100644
--- a/lib/retrace.jar
+++ b/lib/retrace.jar
Binary files differ
diff --git a/src/proguard/obfuscate/MappingPrinter.java b/src/proguard/obfuscate/MappingPrinter.java
index aab779f..537a345 100644
--- a/src/proguard/obfuscate/MappingPrinter.java
+++ b/src/proguard/obfuscate/MappingPrinter.java
@@ -140,7 +140,19 @@ implements ClassVisitor,
public void visitLineNumberTableAttribute(Clazz clazz, Method method, CodeAttribute codeAttribute, LineNumberTableAttribute lineNumberTableAttribute)
{
- ps.print(lineNumberTableAttribute.getLowestLineNumber() + ":" +
- lineNumberTableAttribute.getHighestLineNumber() + ":");
+ // ps.print(lineNumberTableAttribute.getLowestLineNumber() + ":" +
+ // lineNumberTableAttribute.getHighestLineNumber() + ":");
+ // With the above statement,
+ // OpenJDK 8 (openjdk version "1.8.0_45-internal") crashed with:
+ // Exception in thread "main" java.lang.AbstractMethodError:
+ // java.lang.Exception.getMessage()Ljava/lang/String;
+ // at proguard.ProGuard.main(ProGuard.java:519)
+ //
+ // Using temporary variables fixed the crash.
+ // See bug 26274804.
+ int low,high;
+ low = lineNumberTableAttribute.getLowestLineNumber();
+ high = lineNumberTableAttribute.getHighestLineNumber();
+ ps.print(low + ":" + high + ":");
}
}