*Always* check that stream isn't null

Signed-off-by: Sara Damiano <sdamiano@stroudcenter.org>

Author: SRGDamia1

ChangeLog.md

@@ -20,6 +20,14 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 ***
 
+## [1.6.6]
+
+### Fixed
+
+- Fix attempt to set timeouts and run other functions on nullptr
+
+***
+
 ## [1.6.5]
 
 ### Fixed
@@ -322,7 +330,8 @@ This information can now be found in its [own repository](https://github.com/Env
 
 ***
 
-[Unreleased]: https://github.com/EnviroDIY/SensorModbusMaster/compare/v1.6.5...HEAD
+[Unreleased]: https://github.com/EnviroDIY/SensorModbusMaster/compare/v1.6.6...HEAD
+[1.6.6]: https://github.com/EnviroDIY/SensorModbusMaster/releases/tag/v1.6.6
 [1.6.5]: https://github.com/EnviroDIY/SensorModbusMaster/releases/tag/v1.6.5
 [1.6.4]: https://github.com/EnviroDIY/SensorModbusMaster/releases/tag/v1.6.4
 [1.6.3]: https://github.com/EnviroDIY/SensorModbusMaster/releases/tag/v1.6.3

VERSION

@@ -1 +1 @@
-1.6.5
+1.6.6

docs/Doxyfile

@@ -48,7 +48,7 @@ PROJECT_NAME           = SensorModbusMaster
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.6.5
+PROJECT_NUMBER         = 1.6.6
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewers a

library.json

@@ -1,6 +1,6 @@
 {
     "name": "SensorModbusMaster",
-    "version": "1.6.5",
+    "version": "1.6.6",
     "keywords": "sensor, modbus, master, EnviroDIY",
     "description": "Arduino library for communicating via modbus with the Arduino acting as master",
     "repository": {

library.properties

@@ -1,5 +1,5 @@
 name=SensorModbusMaster
-version=1.6.5
+version=1.6.6
 author=Sara Damiano <sdamiano@stroudcenter.org>
 maintainer=Sara Damiano <sdamiano@stroudcenter.org>
 sentence=Arduino library for communicating via modbus with the Arduino acting as master

src/SensorModbusMaster.cpp

@@ -115,7 +115,7 @@ uint32_t modbusMaster::getCommandTimeout() {
 }
 
 void modbusMaster::setFrameTimeout(uint32_t timeout) {
-    _stream->setTimeout(timeout);
+    if (_stream != nullptr) { _stream->setTimeout(timeout); }
     modbusFrameTimeout = timeout;
 }
 uint32_t modbusMaster::getFrameTimeout() {
@@ -131,11 +131,11 @@ uint8_t modbusMaster::getCommandRetries() {
 
 void modbusMaster::setStream(Stream* stream) {
     _stream = stream;
-    _stream->setTimeout(modbusFrameTimeout);
+    if (_stream != nullptr) { _stream->setTimeout(modbusFrameTimeout); }
 }
 void modbusMaster::setStream(Stream& stream) {
     _stream = &stream;
-    _stream->setTimeout(modbusFrameTimeout);
+    if (_stream != nullptr) { _stream->setTimeout(modbusFrameTimeout); }
 }
 Stream* modbusMaster::getStream() {
     return _stream;
@@ -1015,6 +1015,12 @@ bool modbusMaster::setCoils(int16_t startCoil, int16_t numCoils, byte* value) {
 
 // This sends a command to the sensor bus and listens for a response
 uint16_t modbusMaster::sendCommand(byte* command, int commandLength) {
+    if (_stream == nullptr) {
+        debugPrint("Modbus Error: No Stream Defined!\n");
+        lastError = NO_RESPONSE;
+        return static_cast<uint16_t>(lastError) << 12;
+    }
+
     // Empty the response buffer
     memset(responseBuffer, 0x00, RESPONSE_BUFFER_SIZE);