Merge pull request #64 from jannic/check-set-argument

Check if argument of SET instructions is valid
rp-rs · Sep 15, 2024 · 60fd8a5 · 60fd8a5
2 parents 9c9317d + 2ceffff
commit 60fd8a5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/pio-parser/src/lib.rs b/pio-parser/src/lib.rs
@@ -1,4 +1,5 @@
 // PIO instr grouping is 3/5/3/5
+#![allow(clippy::manual_range_contains)]
 #![allow(clippy::unusual_byte_groupings)]
 #![allow(clippy::upper_case_acronyms)]
 
@@ -189,7 +190,13 @@ impl<'i> ParsedOperands<'i> {
             },
             ParsedOperands::SET { destination, data } => InstructionOperands::SET {
                 destination: *destination,
-                data: data.reify(state) as u8,
+                data: {
+                    let arg = data.reify(state);
+                    if arg < 0 || arg > 0x1f {
+                        panic!("SET argument out of range: {}", arg);
+                    }
+                    arg as u8
+                },
             },
         }
     }

diff --git a/src/lib.rs b/src/lib.rs
@@ -273,7 +273,12 @@ impl InstructionOperands {
                     *index | (if *relative { 0b10000 } else { 0 }),
                 )
             }
-            InstructionOperands::SET { destination, data } => (*destination as u8, *data),
+            InstructionOperands::SET { destination, data } => {
+                if *data > 0x1f {
+                    panic!("SET argument out of range");
+                }
+                (*destination as u8, *data)
+            }
         }
     }