Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 06:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_HAL_Linux: GPIO_RPi: Fix UB when reading a pin

Browse Source 
You can't shift by more then the word width
This commit is contained in:
Michael du Breuil 2018-07-10 18:28:49 -07:00 committed by Lucas De Marchi
parent d06a82af1d
commit 0aaa029f9b
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/AP_HAL_Linux/GPIO_RPI.cpp
View File

@ -30,6 +30,7 @@
#define GPIO_SET_HIGH *(_gpio+7) // sets bits which are 1 #define GPIO_SET_HIGH *(_gpio+7) // sets bits which are 1
#define GPIO_SET_LOW *(_gpio+10) // clears bits which are 1 #define GPIO_SET_LOW *(_gpio+10) // clears bits which are 1
#define GPIO_GET(g) (*(_gpio+13)&(1<<g)) // 0 if LOW, (1<<g) if HIGH #define GPIO_GET(g) (*(_gpio+13)&(1<<g)) // 0 if LOW, (1<<g) if HIGH
#define GPIO_RPI_MAX_NUMBER_PINS 32
using namespace Linux; using namespace Linux;
@ -93,6 +94,9 @@ void GPIO_RPI::pinMode(uint8_t pin, uint8_t output, uint8_t alt)
uint8_t GPIO_RPI::read(uint8_t pin) uint8_t GPIO_RPI::read(uint8_t pin)
{ {
if (pin >= GPIO_RPI_MAX_NUMBER_PINS) {
return 0;
}
uint32_t value = GPIO_GET(pin); uint32_t value = GPIO_GET(pin);
return value ? 1: 0; return value ? 1: 0;
} }