don't panic on utf8 error

andrieshiemstra · andrieshiemstra · commit b0aa0ce20ea4 · 2024-10-15T13:07:26.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 0.14.4
+
+* don't panic on utf8 error in to_str
+
 # 0.14.3
 
 * update quickjs-ng to 0.6.0
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "quickjs_runtime"
-version = "0.14.3"
+version = "0.14.4"
 authors = ["Andries Hiemstra <info@hirofa.com>"]
 edition = "2021"
 description = "Wrapper API and utils for the QuickJS JavaScript engine with support for Promise, Modules, Async/await"
diff --git a/src/quickjs_utils/primitives.rs b/src/quickjs_utils/primitives.rs
@@ -124,7 +124,8 @@ pub unsafe fn to_str(
     }
 
     let cstr = std::ffi::CStr::from_ptr(ptr);
-    Ok(cstr.to_str().expect("bad cstr bad!"))
+    cstr.to_str()
+        .map_err(|e| JsError::new_string(format!("utf8 error: {e}")))
 
     //let s = cstr.to_string_lossy();
 

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,8 @@ pub unsafe fn to_str(`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`let cstr = std::ffi::CStr::from_ptr(ptr);`
`127`		`- Ok(cstr.to_str().expect("bad cstr bad!"))`
	`127`	`+ cstr.to_str()`
	`128`	`+ .map_err(\|e\| JsError::new_string(format!("utf8 error: {e}")))`
`128`	`129`
`129`	`130`	`//let s = cstr.to_string_lossy();`
`130`	`131`