utf16 string reading, shouldnt crash, if there is error return empty string

sha0coder · sha0coder · commit cda5ec9aef7b · 2025-08-25T16:50:16.000+02:00
diff --git a/crates/libmwemu/src/maps/mem64.rs b/crates/libmwemu/src/maps/mem64.rs
@@ -533,7 +533,11 @@ impl Mem64 {
                 }
             }).unwrap();
         }
-        String::from_utf16(&s).expect("invalid utf-16")
+        
+        match String::from_utf16(&s) {
+            Ok(s) => { return s; }
+            Err(_) => { return "".to_string(); }
+        }
     }
 
     pub fn read_wide_string_n(&self, addr: u64, max_chars: usize) -> String {

Original file line number	Diff line number	Diff line change
`@@ -533,7 +533,11 @@ impl Mem64 {`
`533`	`533`	`}`
`534`	`534`	`}).unwrap();`
`535`	`535`	`}`
`536`		`- String::from_utf16(&s).expect("invalid utf-16")`
	`536`	`+`
	`537`	`+ match String::from_utf16(&s) {`
	`538`	`+ Ok(s) => { return s; }`
	`539`	`+ Err(_) => { return "".to_string(); }`
	`540`	`+ }`
`537`	`541`	`}`
`538`	`542`
`539`	`543`	`pub fn read_wide_string_n(&self, addr: u64, max_chars: usize) -> String {`