Return Error on invalid offset instead of panic'ing

int08h · Mar 19, 2018 · 1ce57a1 · 1ce57a1
1 parent f80c952
commit 1ce57a1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/error.rs b/src/error.rs
@@ -31,6 +31,9 @@ pub enum Error {
     /// Request was less than 1024 bytes
     RequestTooShort,
 
+    /// Offset within message was not 32-bit aligned 
+    InvalidOffsetAlignment(u32),
+
     /// Otherwise invalid request
     InvalidRequest,
 }

diff --git a/src/message.rs b/src/message.rs
@@ -67,7 +67,7 @@ impl RtMessage {
         for _ in 0..num_tags - 1 {
             let offset = msg.read_u32::<LittleEndian>()?;
             if offset % 4 != 0 {
-                panic!("Invalid offset {:?} in message {:?}", offset, bytes);
+                return Err(Error::InvalidOffsetAlignment(offset));
             }
             offsets.push(offset as usize);
         }