Skip to content

Commit 6434d2f

Browse files
tekka007henrikekblad
authored andcommitted
Linux: Fix null ptr exception (#1025)
1 parent b51c77b commit 6434d2f

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

drivers/RF24/RF24.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ LOCAL uint8_t RF24_spiMultiByteTransfer(const uint8_t cmd, uint8_t* buf, uint8_t
8383
} else {
8484
status = *prx++; // status is 1st byte of receive buffer
8585
// decrement before to skip status byte
86-
while (--size) {
86+
while (--size && (buf != NULL)) {
8787
*buf++ = *prx++;
8888
}
8989
}

drivers/RFM69/new/RFM69_new.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ LOCAL uint8_t RFM69_spiMultiByteTransfer(const uint8_t cmd, uint8_t* buf, uint8_
136136
} else {
137137
status = *prx++; // status is 1st byte of receive buffer
138138
// decrement before to skip status byte
139-
while (--size) {
139+
while (--size && (buf != NULL)) {
140140
*buf++ = *prx++;
141141
}
142142
}

drivers/RFM95/RFM95.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ LOCAL uint8_t RFM95_spiMultiByteTransfer(const uint8_t cmd, uint8_t* buf, uint8_
8383
} else {
8484
status = *prx++; // status is 1st byte of receive buffer
8585
// decrement before to skip status byte
86-
while (--size) {
86+
while (--size && (buf != NULL)) {
8787
*buf++ = *prx++;
8888
}
8989
}

0 commit comments

Comments
 (0)