Merge pull request #7022 from marcuschangarm/fix-gpio

Cruz Monrreal · web-flow · commit cb3f8a5ad354 · 2018-05-29T10:43:23.000-05:00
Fix array overflow in gpio configuration code for NRF5x
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/gpio_api.c b/targets/TARGET_NORDIC/TARGET_NRF5x/gpio_api.c
@@ -112,7 +112,7 @@ static void gpiote_pin_uninit(uint8_t pin)
         if ((m_gpio_cfg[pin].direction == PIN_OUTPUT) && (!m_gpio_cfg[pin].used_as_irq)) {
             nrf_drv_gpiote_out_uninit(pin);
         }
-        else {
+        else if (m_gpio_cfg[pin].used_as_irq) {
             nrf_drv_gpiote_in_uninit(pin);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ static void gpiote_pin_uninit(uint8_t pin)`
`112`	`112`	`if ((m_gpio_cfg[pin].direction == PIN_OUTPUT) && (!m_gpio_cfg[pin].used_as_irq)) {`
`113`	`113`	`nrf_drv_gpiote_out_uninit(pin);`
`114`	`114`	`}`
`115`		`- else {`
	`115`	`+ else if (m_gpio_cfg[pin].used_as_irq) {`
`116`	`116`	`nrf_drv_gpiote_in_uninit(pin);`
`117`	`117`	`}`
`118`	`118`	`}`