Do not register class more than once

dlunch · Dec 28, 2023 · 8a10a7e · 8a10a7e
1 parent 1fc6b53
commit 8a10a7e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/wie_ktf/src/runtime/java/context.rs b/wie_ktf/src/runtime/java/context.rs
@@ -111,6 +111,10 @@ impl<'a> KtfJavaContext<'a> {
     }
 
     pub async fn register_class(core: &mut ArmCore, class: &JavaClass) -> JavaResult<()> {
+        if JavaContextData::has_class(core, class)? {
+            return Ok(());
+        }
+
         JavaContextData::register_class(core, class)?;
 
         let clinit = class.method(&JavaFullName {

diff --git a/wie_ktf/src/runtime/java/context/context_data.rs b/wie_ktf/src/runtime/java/context/context_data.rs
@@ -59,7 +59,7 @@ impl JavaContextData {
 
     pub fn register_class(core: &mut ArmCore, class: &JavaClass) -> JavaResult<()> {
         let context_data = Self::read(core)?;
-        let ptr_classes: alloc::vec::Vec<u32> = read_null_terminated_table(core, context_data.classes_base)?;
+        let ptr_classes = read_null_terminated_table(core, context_data.classes_base)?;
         if ptr_classes.contains(&class.ptr_raw) {
             return Ok(());
         }
@@ -71,6 +71,13 @@ impl JavaContextData {
         )
     }
 
+    pub fn has_class(core: &ArmCore, class: &JavaClass) -> JavaResult<bool> {
+        let context_data = Self::read(core)?;
+        let ptr_classes = read_null_terminated_table(core, context_data.classes_base)?;
+
+        Ok(ptr_classes.contains(&class.ptr_raw))
+    }
+
     pub fn find_class(core: &ArmCore, name: &str) -> JavaResult<Option<JavaClass>> {
         let context_data = Self::read(core)?;
         let classes = read_null_terminated_table(core, context_data.classes_base)?;