Fixed extension panicing with invalid string

davidcole1340 · davidcole1340 · commit d73788e09364 · 2021-05-01T22:06:56.000+12:00
diff --git a/src/php/types/zval.rs b/src/php/types/zval.rs
@@ -77,7 +77,7 @@ impl<'a> Zval {
             unsafe {
                 let len = (*self.value.str_).len;
                 let ptr = (*self.value.str_).val.as_ptr() as *const u8;
-                let _str = std::str::from_utf8(slice::from_raw_parts(ptr, len as usize)).unwrap();
+                let _str = std::str::from_utf8(slice::from_raw_parts(ptr, len as usize)).ok()?;
 
                 Some(_str.to_string())
             }

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ impl<'a> Zval {`
`77`	`77`	`unsafe {`
`78`	`78`	`let len = (*self.value.str_).len;`
`79`	`79`	`let ptr = (self.value.str_).val.as_ptr() as const u8;`
`80`		`- let _str = std::str::from_utf8(slice::from_raw_parts(ptr, len as usize)).unwrap();`
	`80`	`+ let _str = std::str::from_utf8(slice::from_raw_parts(ptr, len as usize)).ok()?;`
`81`	`81`
`82`	`82`	`Some(_str.to_string())`
`83`	`83`	`}`