espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-29 18:27:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/ws_head_buf_size_v5.4' into 'release/v5.4'

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

See merge request espressif/esp-idf!35667
This commit is contained in:
Jiang Jiang Jian
2025-01-07 10:49:25 +08:00
parent 5b09d8d66e 89ef743876
commit 6d7225f336
1 changed files with 6 additions and 1 deletions
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);