Cherry-pick fixes to Arduino Core for our stable branch.

  everslick/emonio-fw#168

Author: everslick

Diff for: cores/esp32/Print.cpp

@@ -63,7 +63,7 @@ size_t Print::printf(const char *format, ...)
     len = vsnprintf(temp, len+1, format, arg);
     write((uint8_t*)temp, len);
     va_end(arg);
-    if(len > 64){
+    if(len >= sizeof(loc_buf)){
         delete[] temp;
     }
     return len;

Diff for: cores/esp32/base64.cpp

@@ -38,7 +38,7 @@ extern "C" {
 String base64::encode(uint8_t * data, size_t length)
 {
     // base64 needs more size then the source data
-    size_t size = ((length * 1.6f) + 1);
+    size_t size = base64_encode_expected_len(length) + 1;
     char * buffer = (char *) malloc(size);
     if(buffer) {
         base64_encodestate _state;

Diff for: cores/esp32/esp32-hal-uart.c

@@ -420,7 +420,7 @@ int log_printf(const char *format, ...)
     vsnprintf(temp, len+1, format, arg);
 #if !CONFIG_DISABLE_HAL_LOCKS
     if(_uart_bus_array[s_uart_debug_nr].lock){
-        while (xSemaphoreTake(_uart_bus_array[s_uart_debug_nr].lock, portMAX_DELAY) != pdPASS);
+        xSemaphoreTake(_uart_bus_array[s_uart_debug_nr].lock, portMAX_DELAY);
         ets_printf("%s", temp);
         xSemaphoreGive(_uart_bus_array[s_uart_debug_nr].lock);
     } else {
@@ -430,7 +430,7 @@ int log_printf(const char *format, ...)
     ets_printf("%s", temp);
 #endif
     va_end(arg);
-    if(len > 64){
+    if(len >= sizeof(loc_buf)){
         free(temp);
     }
     return len;

Diff for: cores/esp32/libb64/cencode.c

@@ -7,13 +7,10 @@ For details, see http://sourceforge.net/projects/libb64
 
 #include "cencode.h"
 
-const int CHARS_PER_LINE = 72;
-
 void base64_init_encodestate(base64_encodestate* state_in)
 {
     state_in->step = step_A;
     state_in->result = 0;
-    state_in->stepcount = 0;
 }
 
 char base64_encode_value(char value_in)
@@ -68,12 +65,6 @@ int base64_encode_block(const char* plaintext_in, int length_in, char* code_out,
             *codechar++ = base64_encode_value(result);
             result  = (fragment & 0x03f) >> 0;
             *codechar++ = base64_encode_value(result);
-
-            ++(state_in->stepcount);
-            if (state_in->stepcount == CHARS_PER_LINE/4) {
-                *codechar++ = '\n';
-                state_in->stepcount = 0;
-            }
         }
     }
     /* control should not reach here */

Diff for: libraries/HTTPClient/src/HTTPClient.cpp

@@ -1042,6 +1042,10 @@ int HTTPClient::writeToStreamDataBlock(Stream * stream, int size)
                     readBytes = buff_size;
                 }
 
+                // stop if no more reading
+                if (readBytes == 0)
+                    break;
+
                 // read data
                 int bytesRead = _tcp->readBytes(buff, readBytes);
 

Diff for: 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;
@@ -397,7 +404,7 @@ int WiFiClient::peek()
 
 int WiFiClient::available()
 {
-    if(!_connected) {
+    if(!_rxBuffer) {
         return 0;
     }
     int res = _rxBuffer->available();

Diff for: libraries/WiFi/src/WiFiGeneric.cpp

@@ -90,7 +90,7 @@ static void _start_network_event_task(){
         }
     }
     if(!_network_event_task_handle){
-        xTaskCreatePinnedToCore(_network_event_task, "network_event", 4096, NULL, 2, &_network_event_task_handle, ARDUINO_RUNNING_CORE);
+        xTaskCreatePinnedToCore(_network_event_task, "network_event", 4096, NULL, ESP_TASKD_EVENT_PRIO - 1, &_network_event_task_handle, ARDUINO_RUNNING_CORE);
         if(!_network_event_task_handle){
             log_e("Network Event Task Start Failed!");
             return;