2.5.2

Konloch · Konloch · commit f7fe03ed5a4c · 2015-01-06T11:01:49.000-08:00
01/06/2015 - Fixed another issue with LDC searching for Android APKs.
diff --git a/BytecodeViewer 2.5.2.jar b/BytecodeViewer 2.5.2.jar
diff --git 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.
+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.
diff --git a/src/the/bytecode/club/bytecodeviewer/BytecodeViewer.java b/src/the/bytecode/club/bytecodeviewer/BytecodeViewer.java
@@ -257,6 +257,8 @@
  * -----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<String> recentFiles = DiskReader.loadArrayList(filesName, false);
 	private static ArrayList<String> 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 void run() {
 						}
 					}
 				} 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
@@ -60,10 +60,16 @@ public void search(final ClassNode node, final SearchResultNotifier srn,
 				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
@@ -7,6 +7,7 @@
 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 void search(final ClassNode node, final SearchResultNotifier srn,
 			}
 
 			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);
 			}
 
 		}

Original file line number	Diff line number	Diff line change
`@@ -257,6 +257,8 @@`
`257`	`257`	`* -----2.5.1-----:`
`258`	`258`	`* 01/06/2015 - Silenced the error connecting to update server for offline mode.`
`259`	`259`	`* 01/06/2015 - Fixed a search function with Android APKs.`
	`260`	`+ * -----2.5.2-----:`
	`261`	`+ * 01/06/2015 - Fixed another issue with LDC searching for Android APKs.`
`260`	`262`	`*`
`261`	`263`	`* @author Konloch`
`262`	`264`	`*`
`@@ -277,7 +279,7 @@ public class BytecodeViewer {`
`277`	`279`	`private static ArrayList<String> recentFiles = DiskReader.loadArrayList(filesName, false);`
`278`	`280`	`private static ArrayList<String> recentPlugins = DiskReader.loadArrayList(pluginsName, false);`
`279`	`281`	`public static boolean runningObfuscation = false;`
`280`		`- public static String version = "2.5.1";`
	`282`	`+ public static String version = "2.5.2";`
`281`	`283`	`private static long start = System.currentTimeMillis();`
`282`	`284`
`283`	`285`	`public static void main(String[] args) {`
`@@ -469,7 +471,7 @@ public void run() {`
`469`	`471`	`}`
`470`	`472`	`}`
`471`	`473`	`} catch (Exception e) {`
`472`		`- //new the.bytecode.club.bytecodeviewer.api.ExceptionUI(e);`
	`474`	`+ e.printStackTrace();`
`473`	`475`	`}`
`474`	`476`	`}`
`475`	`477`	`};`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`import javax.swing.JPanel;`
`8`	`8`	`import javax.swing.JTextField;`
`9`	`9`
	`10`	`+import org.objectweb.asm.Type;`
`10`	`11`	`import org.objectweb.asm.tree.ClassNode;`
`11`	`12`	`import org.objectweb.asm.tree.MethodNode;`
`12`	`13`
`@@ -54,7 +55,13 @@ public void search(final ClassNode node, final SearchResultNotifier srn,`
`54`	`55`	`}`
`55`	`56`
`56`	`57`	`if (regexFinder.find(srchText).length > 0) {`
`57`		`- srn.notifyOfResult(node.name + "." + method.name + method.desc);`
	`58`	`+ String desc2 = method.desc;`
	`59`	`+ try {`
	`60`	`+ desc2 = Type.getType(method.desc).toString();`
	`61`	`+ } catch(java.lang.ArrayIndexOutOfBoundsException e) {`
	`62`	`+`
	`63`	`+ }`
	`64`	`+ srn.notifyOfResult(node.name + "." + method.name + desc2);`
`58`	`65`	`}`
`59`	`66`
`60`	`67`	`}`