Merge pull request #896 from JAndrassy/mbedclient_read_stopped_crash_fix

facchinm · web-flow · commit 14950ea2a0e8 · 2024-06-19T09:09:16.000+02:00
SocketWrapper MbedClient read() fixes
diff --git a/libraries/SocketWrapper/src/MbedClient.cpp b/libraries/SocketWrapper/src/MbedClient.cpp
@@ -229,6 +229,8 @@ int arduino::MbedClient::available() {
 }
 
 int arduino::MbedClient::read() {
+  if (sock == nullptr)
+    return -1;
   mutex->lock();
   if (!available()) {
     mutex->unlock();
@@ -241,6 +243,8 @@ int arduino::MbedClient::read() {
 }
 
 int arduino::MbedClient::read(uint8_t *data, size_t len) {
+  if (sock == nullptr)
+    return 0;
   mutex->lock();
   int avail = available();
 

Original file line number	Diff line number	Diff line change
`@@ -229,6 +229,8 @@ int arduino::MbedClient::available() {`
`229`	`229`	`}`
`230`	`230`
`231`	`231`	`int arduino::MbedClient::read() {`
	`232`	`+ if (sock == nullptr)`
	`233`	`+ return -1;`
`232`	`234`	`mutex->lock();`
`233`	`235`	`if (!available()) {`
`234`	`236`	`mutex->unlock();`
`@@ -241,6 +243,8 @@ int arduino::MbedClient::read() {`
`241`	`243`	`}`
`242`	`244`
`243`	`245`	`int arduino::MbedClient::read(uint8_t *data, size_t len) {`
	`246`	`+ if (sock == nullptr)`
	`247`	`+ return 0;`
`244`	`248`	`mutex->lock();`
`245`	`249`	`int avail = available();`
`246`	`250`