Fix WiFiClientRxBuffer::fillBuffer() error in handing a negative res from the call to recv()

Jeroen88 · Jeroen88 · commit 851ceb570a77 · 2019-01-01T15:18:24.000+01:00
diff --git a/libraries/BLE b/libraries/BLE
@@ -1 +1 @@
-Subproject commit b232e7f5f0e87f36afbc2f4e03a2c49c48dd47bc
+Subproject commit 11a0aa645326aed0cb681e86060fe28d4623bc68
diff --git a/libraries/WiFi/src/WiFiClient.cpp b/libraries/WiFi/src/WiFiClient.cpp
@@ -58,6 +58,10 @@ class WiFiClientRxBuffer {
         {
             if(!_buffer){
                 _buffer = (uint8_t *)malloc(_size);
+                if(!_buffer) {
+                    _failed = true;
+                    return 0;
+                }
             }
             if(_fill && _pos == _fill){
                 _fill = 0;
@@ -67,8 +71,10 @@ class WiFiClientRxBuffer {
                 return 0;
             }
             int res = recv(_fd, _buffer + _fill, _size - _fill, MSG_DONTWAIT);
-            if(res < 0 && errno != EWOULDBLOCK) {
-                _failed = true;
+            if(res < 0) {
+                if(errno != EWOULDBLOCK) {
+                    _failed = true;
+                }
                 return 0;
             }
             _fill += res;

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,10 @@ class WiFiClientRxBuffer {`
`58`	`58`	`{`
`59`	`59`	`if(!_buffer){`
`60`	`60`	`_buffer = (uint8_t *)malloc(_size);`
	`61`	`+ if(!_buffer) {`
	`62`	`+ _failed = true;`
	`63`	`+ return 0;`
	`64`	`+ }`
`61`	`65`	`}`
`62`	`66`	`if(_fill && _pos == _fill){`
`63`	`67`	`_fill = 0;`
`@@ -67,8 +71,10 @@ class WiFiClientRxBuffer {`
`67`	`71`	`return 0;`
`68`	`72`	`}`
`69`	`73`	`int res = recv(_fd, _buffer + _fill, _size - _fill, MSG_DONTWAIT);`
`70`		`- if(res < 0 && errno != EWOULDBLOCK) {`
`71`		`- _failed = true;`
	`74`	`+ if(res < 0) {`
	`75`	`+ if(errno != EWOULDBLOCK) {`
	`76`	`+ _failed = true;`
	`77`	`+ }`
`72`	`78`	`return 0;`
`73`	`79`	`}`
`74`	`80`	`_fill += res;`