fix(profiling): mismatch in utf8 handling (#2990)

Co-authored-by: Florian Engelhardt <[email protected]>
DataDog · Dec 12, 2024 · 4bf79f2 · 4bf79f2
1 parent 8273bb7
commit 4bf79f2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/profiling/src/timeline.rs b/profiling/src/timeline.rs
@@ -204,21 +204,16 @@ unsafe extern "C" fn ddog_php_prof_zend_error_observer(
     }
 
     #[cfg(zend_error_observer_80)]
-    let file = unsafe {
-        let mut len = 0;
-        let file = file as *const u8;
-        while *file.add(len) != 0 {
-            len += 1;
-        }
-        std::str::from_utf8_unchecked(std::slice::from_raw_parts(file, len)).to_string()
-    };
+    let filename_str = unsafe { core::ffi::CStr::from_ptr(file) };
     #[cfg(not(zend_error_observer_80))]
-    let file = unsafe { zend::zai_str_from_zstr(file.as_mut()).into_string() };
+    let filename_str = unsafe { zai_str_from_zstr(file.as_mut()) };
+
+    let filename = filename_str.to_string_lossy().into_owned();
 
     let now = SystemTime::now().duration_since(UNIX_EPOCH).unwrap();
     if let Some(profiler) = Profiler::get() {
         let now = now.as_nanos() as i64;
-        profiler.collect_fatal(now, file, line, unsafe {
+        profiler.collect_fatal(now, filename, line, unsafe {
             zend::zai_str_from_zstr(message.as_mut()).into_string()
         });
     }