prevents an overflowing subtraction when using JLink

oxidecomputer · Sep 9, 2022 · fb0b872 · fb0b872
1 parent f1111c8
commit fb0b872
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/humility-core/src/core.rs b/humility-core/src/core.rs
@@ -851,7 +851,9 @@ impl GDBCore {
             // We are done when we have our closing delimter followed by
             // the two byte checksum.
             //
-            if result.find(GDB_PACKET_END) == Some(result.len() - 3) {
+            if result.len() >= 3
+                && result.find(GDB_PACKET_END) == Some(result.len() - 3)
+            {
                 break;
             }
         }

diff --git a/humility-core/src/hubris.rs b/humility-core/src/hubris.rs
@@ -678,7 +678,8 @@ impl HubrisArchive {
             let file = match header.file(file) {
                 Some(header) => header,
                 None => {
-                    bail!("no header at {}", goff);
+                    //bail!("no header at {}", goff);
+                    return Ok(());
                 }
             };