Refactor ByteLoader to conform to intended ways of class loading.

Prevents infinite loop when class is not present.

Author: Janmm14

src/java/com/javadeobfuscator/deobfuscator/ui/util/ByteLoader.java

@@ -1,6 +1,5 @@
 package com.javadeobfuscator.deobfuscator.ui.util;
 
-import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
@@ -13,10 +12,6 @@ public final class ByteLoader extends ClassLoader
 	 * Map of class names to their bytecode.
 	 */
 	private final Map<String, byte[]> classes;
-	/**
-	 * Set of loaded names.
-	 */
-	private final Set<String> loaded = new HashSet<>();
 
 	/**
 	 * Create the loader with the map of classes to load from.
@@ -31,20 +26,23 @@ public ByteLoader(Map<String, byte[]> classes)
 	}
 
 	@Override
-	public final Class<?> findClass(String name) throws ClassNotFoundException
+	protected final Class<?> findClass(String name) throws ClassNotFoundException
 	{
-		// Load from map of classes
-		if (!loaded.contains(name) && classes.containsKey(name))
+		Class<?> loadedClass = findLoadedClass(name);
+		if (loadedClass != null)
+		{
+			return loadedClass;
+		}
+		
+		byte[] bytes = classes.get(name);
+		if (bytes == null)
 		{
-			byte[] bytes = classes.get(name);
-			loaded.add(name);
-			return defineClass(name, bytes, 0, bytes.length, null);
+			throw new ClassNotFoundException(name);
 		}
-		// Unknown class, defer to system ClassLoader
-		return loadClass(name, false);
+		return defineClass(name, bytes, 0, bytes.length);
 	}
 
-	public Set<String> getClassNames()
+	public final Set<String> getClassNames()
 	{
 		return classes.keySet();
 	}

src/java/com/javadeobfuscator/deobfuscator/ui/wrap/Deobfuscator.java

@@ -58,7 +58,7 @@ public Config getConfig() throws FallbackException
 		{
 			try
 			{
-				Class<?> conf = loader.findClass("com.javadeobfuscator.deobfuscator.config.Configuration");
+				Class<?> conf = loader.loadClass("com.javadeobfuscator.deobfuscator.config.Configuration");
 				config = new Config(conf.newInstance());
 			} catch (Exception e)
 			{
@@ -75,7 +75,7 @@ public Config getConfig() throws FallbackException
 	 */
 	public void run() throws Exception
 	{
-		Class<?> main = loader.findClass("com.javadeobfuscator.deobfuscator.Deobfuscator");
+		Class<?> main = loader.loadClass("com.javadeobfuscator.deobfuscator.Deobfuscator");
 		Config conf = getConfig();
 		Constructor<?> con = main.getDeclaredConstructor(conf.get().getClass());
 		Object deob = con.newInstance(conf.get());
@@ -95,7 +95,7 @@ public void clearClasses()
 		{
 			if (instance != null)
 			{
-				Class<?> main = loader.findClass("com.javadeobfuscator.deobfuscator.Deobfuscator");
+				Class<?> main = loader.loadClass("com.javadeobfuscator.deobfuscator.Deobfuscator");
 				Field cp = main.getDeclaredField("classpath");
 				cp.setAccessible(true);
 				((Map<?, ?>) cp.get(instance)).clear();
@@ -135,13 +135,13 @@ public void clearClasses()
 	private void hookLogger(String ownerName, PrintStream hook) throws Exception
 	{
 		// unused, but required to load class, which sets up some important static fields
-		getLogger(loader.findClass(ownerName));
-		Class<?> simpleLogger = loader.findClass("org.slf4j.simple.SimpleLogger");
+		getLogger(loader.loadClass(ownerName));
+		Class<?> simpleLogger = loader.loadClass("org.slf4j.simple.SimpleLogger");
 
 		Object config = Reflect.getFieldS(simpleLogger, "CONFIG_PARAMS");
 		Object outChoice = Reflect.getFieldO(config, "outputChoice");
 
-		Class<?> typeEnum = loader.findClass("org.slf4j.simple.OutputChoice$OutputChoiceType");
+		Class<?> typeEnum = loader.loadClass("org.slf4j.simple.OutputChoice$OutputChoiceType");
 		Object enumChoice = Reflect.getFieldS(typeEnum, "FILE");
 
 		// hook
@@ -152,7 +152,7 @@ private void hookLogger(String ownerName, PrintStream hook) throws Exception
 	private Object getLogger(Class<?> loggerOwner) throws Exception
 	{
 		// LoggerFactory.getLogger(getClass())
-		Class<?> factory = loader.findClass("org.slf4j.LoggerFactory");
+		Class<?> factory = loader.loadClass("org.slf4j.LoggerFactory");
 		Method m = factory.getDeclaredMethod("getLogger", Class.class);
 		return m.invoke(null, loggerOwner);
 	}

src/java/com/javadeobfuscator/deobfuscator/ui/wrap/Transformers.java

@@ -38,15 +38,15 @@ public List<Class<?>> getTransformers() throws FallbackException
 		{
 			try
 			{
-				Class<?> transformer = loader.findClass("com.javadeobfuscator.deobfuscator.transformers.Transformer");
-				Class<?> transformerD = loader.findClass("com.javadeobfuscator.deobfuscator.transformers.DelegatingTransformer");
+				Class<?> transformer = loader.loadClass("com.javadeobfuscator.deobfuscator.transformers.Transformer");
+				Class<?> transformerD = loader.loadClass("com.javadeobfuscator.deobfuscator.transformers.DelegatingTransformer");
 				List<String> names = new ArrayList<>(loader.getClassNames());
 				Collections.sort(names);
 				for (String name : names)
 				{
 					if (name.startsWith("com.javadeobfuscator.deobfuscator.transformers."))
 					{
-						Class<?> clazz = loader.findClass(name);
+						Class<?> clazz = loader.loadClass(name);
 						if (!clazz.equals(transformer) && !clazz.equals(transformerD) && transformer.isAssignableFrom(clazz)
 							&& !Modifier.isAbstract(clazz.getModifiers()))
 						{
@@ -69,7 +69,7 @@ public List<Class<?>> getTransformers() throws FallbackException
 	 */
 	public Object getConfigFor(Class<?> transClass) throws Exception
 	{
-		Class<?> confLoader = loader.findClass("com.javadeobfuscator.deobfuscator.config.TransformerConfig");
+		Class<?> confLoader = loader.loadClass("com.javadeobfuscator.deobfuscator.config.TransformerConfig");
 		Method configFor = confLoader.getDeclaredMethod("configFor", Class.class);
 		return configFor.invoke(null, transClass);
 	}