diff --git a/BytecodeViewer 2.5.1.jar b/BytecodeViewer 2.5.2.jar similarity index 93% rename from BytecodeViewer 2.5.1.jar rename to BytecodeViewer 2.5.2.jar index fc9e6afe..b114d670 100644 Binary files a/BytecodeViewer 2.5.1.jar and b/BytecodeViewer 2.5.2.jar differ diff --git a/README.txt b/README.txt index 0e044d86..f6f0652d 100644 --- a/README.txt +++ b/README.txt @@ -234,4 +234,6 @@ Changelog: 01/06/2015 - Added save as DEX and import .dex files. --- 2.5.1 ---: 01/06/2015 - Silenced the error connecting to update server for offline mode. -01/06/2015 - Fixed a search function with Android APKs. \ No newline at end of file +01/06/2015 - Fixed a search function with Android APKs. +--- 2.5.1 ---: +01/06/2015 - Fixed another issue with LDC searching for Android APKs.01/06/2015 - Fixed another issue with LDC searching for Android APKs. \ No newline at end of file diff --git a/src/the/bytecode/club/bytecodeviewer/BytecodeViewer.java b/src/the/bytecode/club/bytecodeviewer/BytecodeViewer.java index 20e2e3e9..9d100cdb 100644 --- a/src/the/bytecode/club/bytecodeviewer/BytecodeViewer.java +++ b/src/the/bytecode/club/bytecodeviewer/BytecodeViewer.java @@ -257,6 +257,8 @@ import the.bytecode.club.bytecodeviewer.plugins.PluginManager; * -----2.5.1-----: * 01/06/2015 - Silenced the error connecting to update server for offline mode. * 01/06/2015 - Fixed a search function with Android APKs. + * -----2.5.2-----: + * 01/06/2015 - Fixed another issue with LDC searching for Android APKs. * * @author Konloch * @@ -277,7 +279,7 @@ public class BytecodeViewer { private static ArrayList recentFiles = DiskReader.loadArrayList(filesName, false); private static ArrayList recentPlugins = DiskReader.loadArrayList(pluginsName, false); public static boolean runningObfuscation = false; - public static String version = "2.5.1"; + public static String version = "2.5.2"; private static long start = System.currentTimeMillis(); public static void main(String[] args) { @@ -469,7 +471,7 @@ public class BytecodeViewer { } } } catch (Exception e) { - //new the.bytecode.club.bytecodeviewer.api.ExceptionUI(e); + e.printStackTrace(); } } }; diff --git a/src/the/bytecode/club/bytecodeviewer/searching/LDCSearch.java b/src/the/bytecode/club/bytecodeviewer/searching/LDCSearch.java index c5e61ebe..f4fb8c94 100644 --- a/src/the/bytecode/club/bytecodeviewer/searching/LDCSearch.java +++ b/src/the/bytecode/club/bytecodeviewer/searching/LDCSearch.java @@ -60,10 +60,16 @@ public class LDCSearch implements SearchTypeDetails { if (insnNode instanceof LdcInsnNode) { final LdcInsnNode ldcObject = ((LdcInsnNode) insnNode); final String ldcString = ldcObject.cst.toString(); + String desc2 = method.desc; + try { + desc2 = Type.getType(method.desc).toString(); + } catch(java.lang.ArrayIndexOutOfBoundsException e) { + + } if ((exact && ldcString.equals(srchText)) || (!exact && ldcString.contains(srchText))) { srn.notifyOfResult(node.name + "." + method.name - + Type.getType(method.desc).getInternalName() + + desc2 + " -> \"" + ldcString + "\" > " + ldcObject.cst.getClass().getCanonicalName()); } diff --git a/src/the/bytecode/club/bytecodeviewer/searching/RegexSearch.java b/src/the/bytecode/club/bytecodeviewer/searching/RegexSearch.java index 00ab4a98..518c8ca9 100644 --- a/src/the/bytecode/club/bytecodeviewer/searching/RegexSearch.java +++ b/src/the/bytecode/club/bytecodeviewer/searching/RegexSearch.java @@ -7,6 +7,7 @@ import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JTextField; +import org.objectweb.asm.Type; import org.objectweb.asm.tree.ClassNode; import org.objectweb.asm.tree.MethodNode; @@ -54,7 +55,13 @@ public class RegexSearch implements SearchTypeDetails { } if (regexFinder.find(srchText).length > 0) { - srn.notifyOfResult(node.name + "." + method.name + method.desc); + String desc2 = method.desc; + try { + desc2 = Type.getType(method.desc).toString(); + } catch(java.lang.ArrayIndexOutOfBoundsException e) { + + } + srn.notifyOfResult(node.name + "." + method.name + desc2); } }