Merge branch 'panic-strlen' into 'master'

Avoid panic by uninitialized string of strlen See merge request redox-os/relibc!744
2025-10-09 10:58:28 -06:00
parent 82fa75a124 036dd3fb73
commit 02e4d98020
1 changed files with 3 additions and 1 deletions
@@ -423,7 +423,9 @@ pub unsafe extern "C" fn strlcpy(dst: *mut c_char, src: *const c_char, n: size_t
 /// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strlen.html>.
 #[unsafe(no_mangle)]
 pub unsafe extern "C" fn strlen(s: *const c_char) -> size_t {
-    unsafe { NulTerminated::new(s).unwrap() }.count()
+    unsafe { NulTerminated::new(s) }
+        .map(|s| s.count())
+        .unwrap_or(0)
 }

 /// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strncat.html>.