Inverted larger-than operators for bit_pos>NOT_A_PIN and port>NOT_A_PORT as part of code review of pinMode(). NOT_A_PIN and NOT_A_PORT are defined as 255

Author: Bekken, Kristian_saxrud

cores/arduino/Arduino.h

@@ -80,7 +80,7 @@ extern const uint8_t PROGMEM digital_pin_to_interrupt[];
 
 // Get the bit location within the hardware port of the given virtual pin.
 // This comes from the pins_*.c file for the active board configuration.
-// 
+//
 // These perform slightly better as macros compared to inline functions
 //
 #define digitalPinToPort(pin) ( (pin < NUM_TOTAL_PINS) ? pgm_read_byte(digital_pin_to_port + pin) : NOT_A_PIN )
@@ -90,9 +90,10 @@ extern const uint8_t PROGMEM digital_pin_to_interrupt[];
 #define analogPinToBitMask(pin) ( (pin < NUM_ANALOG_INPUTS) ? (1 << analogPinToBitPosition(pin)) : NOT_A_PIN )
 #define digitalPinToTimer(pin) ( (pin < NUM_TOTAL_PINS) ? pgm_read_byte(digital_pin_to_timer + pin) : NOT_ON_TIMER )
 
-#define portToPortStruct(port) ((PORT_t *)&PORTA + port)
+#define portToPortStruct(port) ( (port < NOT_A_PORT) ? ((PORT_t *)&PORTA + port) : NULL)
 #define digitalPinToPortStruct(pin) ( (pin < NUM_TOTAL_PINS) ? ((PORT_t *)&PORTA + digitalPinToPort(pin)) : NULL)
-#define getPINnCTRLregister(port, bit_pos) ( (port != NULL) ? ((uint8_t *)&(port->PIN0CTRL) + bit_pos) : NULL )
+#define getPINnCTRLregister(port, bit_pos) ( ((port != NULL) && (bit_pos < NOT_A_PIN)) ? ((uint8_t *)&(port->PIN0CTRL) + bit_pos) : NULL )
+
 #define digitalPinToInterrupt(p) ( pgm_read_byte(digital_pin_to_interrupt + p) )
 #define portPinToInterrupt(port, bit_pos) ( pgm_read_byte(port_interrupt_offset + port) + bit_pos )