blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-09 17:19:09 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'bugfix/ws_head_buf_size' into 'master'

Browse Source 
fix(tcp_transport): Fix websocket header read to handle overflow

See merge request espressif/esp-idf!35139
This commit is contained in:
David Čermák 2024-12-05 16:22:56 +08:00
commit 94d4b6c44b
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
components/tcp_transport/transport_ws.c
View File

@ -293,7 +293,12 @@ static int ws_connect(esp_transport_handle_t t, const char *host, int port, int
ws->buffer_len = header_len;
ws->buffer[header_len] = '\0'; // We will mark the end of the header to ensure that strstr operations for parsing the headers don't fail.
ESP_LOGD(TAG, "Read header chunk %d, current header size: %d", len, header_len);
} while (NULL == strstr(ws->buffer, delimiter) && header_len < WS_BUFFER_SIZE);
} while (NULL == strstr(ws->buffer, delimiter) && header_len < WS_BUFFER_SIZE - 1);
if (header_len >= WS_BUFFER_SIZE - 1) {
ESP_LOGE(TAG, "Header size exceeded buffer size");
return -1;
}
char* delim_ptr = strstr(ws->buffer, delimiter);