Merge pull request #6550 from crackmonkey/rp2040-wait-pin-bounds

tannewt · web-flow · commit 18d7165e0fcf · 2022-07-05T12:56:14.000-07:00
issue #6538 loose bounds checking on WAIT PIO instruction
diff --git a/ports/raspberrypi/common-hal/rp2pio/StateMachine.c b/ports/raspberrypi/common-hal/rp2pio/StateMachine.c
@@ -436,7 +436,7 @@ void common_hal_rp2pio_statemachine_construct(rp2pio_statemachine_obj_t *self,
                 if (first_in_pin == NULL) {
                     mp_raise_ValueError_varg(translate("Missing first_in_pin. Instruction %d waits based on pin"), i);
                 }
-                if (wait_index > in_pin_count) {
+                if (wait_index >= in_pin_count) {
                     mp_raise_ValueError_varg(translate("Instruction %d waits on input outside of count"), i);
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -436,7 +436,7 @@ void common_hal_rp2pio_statemachine_construct(rp2pio_statemachine_obj_t *self,`
`436`	`436`	`if (first_in_pin == NULL) {`
`437`	`437`	`mp_raise_ValueError_varg(translate("Missing first_in_pin. Instruction %d waits based on pin"), i);`
`438`	`438`	`}`
`439`		`- if (wait_index > in_pin_count) {`
	`439`	`+ if (wait_index >= in_pin_count) {`
`440`	`440`	`mp_raise_ValueError_varg(translate("Instruction %d waits on input outside of count"), i);`
`441`	`441`	`}`
`442`	`442`	`}`