Redo PR espressif#2259 because I messed up my local git (espressif#2263)

Jeroen88 · me-no-dev · commit 00e69a28bc5b · 2019-01-02T17:44:17.000+02:00
diff --git a/libraries/WiFi/src/WiFiClient.cpp b/libraries/WiFi/src/WiFiClient.cpp
@@ -58,6 +58,11 @@ class WiFiClientRxBuffer {
         {
             if(!_buffer){
                 _buffer = (uint8_t *)malloc(_size);
+                if(!_buffer) {
+                    log_e("Not enough memory to allocate buffer");
+                    _failed = true;
+                    return 0;
+                }
             }
             if(_fill && _pos == _fill){
                 _fill = 0;
@@ -67,8 +72,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,11 @@ class WiFiClientRxBuffer {`
`58`	`58`	`{`
`59`	`59`	`if(!_buffer){`
`60`	`60`	`_buffer = (uint8_t *)malloc(_size);`
	`61`	`+ if(!_buffer) {`
	`62`	`+ log_e("Not enough memory to allocate buffer");`
	`63`	`+ _failed = true;`
	`64`	`+ return 0;`
	`65`	`+ }`
`61`	`66`	`}`
`62`	`67`	`if(_fill && _pos == _fill){`
`63`	`68`	`_fill = 0;`
`@@ -67,8 +72,10 @@ class WiFiClientRxBuffer {`
`67`	`72`	`return 0;`
`68`	`73`	`}`
`69`	`74`	`int res = recv(_fd, _buffer + _fill, _size - _fill, MSG_DONTWAIT);`
`70`		`- if(res < 0 && errno != EWOULDBLOCK) {`
`71`		`- _failed = true;`
	`75`	`+ if(res < 0) {`
	`76`	`+ if(errno != EWOULDBLOCK) {`
	`77`	`+ _failed = true;`
	`78`	`+ }`
`72`	`79`	`return 0;`
`73`	`80`	`}`
`74`	`81`	`_fill += res;`