Merge pull request #707 from bytedance/fix-unwrap

fix process unwrap
bytedance · Nov 8, 2024 · 384c217 · 384c217
2 parents 4d48d28 + d484d22
commit 384c217
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/rasp/librasp/src/process.rs b/rasp/librasp/src/process.rs
@@ -119,7 +119,18 @@ impl ProcessInfo {
         self.sgid = status.sgid;
         self.fuid = status.fuid;
         self.fgid = status.fgid;
-        self.nspid = Self::read_nspid(process.pid).unwrap_or_default().unwrap();
+        self.nspid =  match Self::read_nspid(process.pid) {
+            Ok(nspid_option) => {
+                if let Some(nspid) = nspid_option {
+                    nspid
+                } else {
+                    process.pid
+                }
+            }
+            Err(e) => {
+                return Err(anyhow!(e));
+            }
+        };
         Ok(())
     }
     pub fn update_start_time(&mut self, process: &Process) -> AnyhowResult<f32> {