Merge pull request #4252 from Champ-Goblem/patch/fix-is-signal-handled

agent: Fix is_signal_handled failing parsing str to u64
kata-containers · May 17, 2022 · 04bd8f1 · 04bd8f1
2 parents 12f0ab1 + 4b437d9
commit 04bd8f1
Showing 1 changed file with 21 additions and 1 deletion.
diff --git a/src/agent/src/rpc.rs b/src/agent/src/rpc.rs
@@ -1682,7 +1682,7 @@ fn is_signal_handled(proc_status_file: &str, signum: u32) -> bool {
                 warn!(sl!(), "parse the SigCgt field failed");
                 return false;
             }
-            let sig_cgt_str = mask_vec[1];
+            let sig_cgt_str = mask_vec[1].trim();
             let sig_cgt_mask = match u64::from_str_radix(sig_cgt_str, 16) {
                 Ok(h) => h,
                 Err(_) => {
@@ -2453,6 +2453,26 @@ OtherField:other
                 signum: 4,
                 result: true,
             },
+            TestData {
+                status_file_data: Some("SigCgt:\t000000004b813efb"),
+                signum: 4,
+                result: true,
+            },
+            TestData {
+                status_file_data: Some("SigCgt: 000000004b813efb"),
+                signum: 4,
+                result: true,
+            },
+            TestData {
+                status_file_data: Some("SigCgt:000000004b813efb "),
+                signum: 4,
+                result: true,
+            },
+            TestData {
+                status_file_data: Some("SigCgt:\t000000004b813efb "),
+                signum: 4,
+                result: true,
+            },
             TestData {
                 status_file_data: Some("SigCgt:000000004b813efb"),
                 signum: 3,