Linux: Fix null ptr exception (#1025)

mysensors · Jan 7, 2018 · 6434d2f · 6434d2f
1 parent b51c77b
commit 6434d2f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/drivers/RF24/RF24.cpp b/drivers/RF24/RF24.cpp
@@ -83,7 +83,7 @@ LOCAL uint8_t RF24_spiMultiByteTransfer(const uint8_t cmd, uint8_t* buf, uint8_t
 		} else {
 			status = *prx++; // status is 1st byte of receive buffer
 			// decrement before to skip status byte
-			while (--size) {
+			while (--size && (buf != NULL)) {
 				*buf++ = *prx++;
 			}
 		}

diff --git a/drivers/RFM69/new/RFM69_new.cpp b/drivers/RFM69/new/RFM69_new.cpp
@@ -136,7 +136,7 @@ LOCAL uint8_t RFM69_spiMultiByteTransfer(const uint8_t cmd, uint8_t* buf, uint8_
 		} else {
 			status = *prx++; // status is 1st byte of receive buffer
 			// decrement before to skip status byte
-			while (--size) {
+			while (--size && (buf != NULL)) {
 				*buf++ = *prx++;
 			}
 		}

diff --git a/drivers/RFM95/RFM95.cpp b/drivers/RFM95/RFM95.cpp
@@ -83,7 +83,7 @@ LOCAL uint8_t RFM95_spiMultiByteTransfer(const uint8_t cmd, uint8_t* buf, uint8_
 		} else {
 			status = *prx++; // status is 1st byte of receive buffer
 			// decrement before to skip status byte
-			while (--size) {
+			while (--size && (buf != NULL)) {
 				*buf++ = *prx++;
 			}
 		}