Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-08-18 06:35:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: fixes websocket server possible null dereference

Browse Source
This commit is contained in:
Ashish Sharma
2026-03-19 14:59:39 +08:00
parent 495904b15f
commit 00a2f7fbbb
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
components/esp_http_server/src/httpd_ws.c
View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2020-2025 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2020-2026 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -82,12 +82,15 @@ static bool httpd_ws_get_response_subprotocol(const char *supported_subprotocol,
/* Get first subprotocol from comma separated list */ /* Get first subprotocol from comma separated list */
char *rest = NULL; char *rest = NULL;
char *s = strtok_r(subprotocol, ", ", &rest); char *s = strtok_r(subprotocol, ", ", &rest);
do { int supported_subprotocol_len = strlen(supported_subprotocol);
if (strncmp(s, supported_subprotocol, sizeof(subprotocol)) == 0) { while (s != NULL) {
if (strlen(s) == supported_subprotocol_len &&
strncmp(s, supported_subprotocol, supported_subprotocol_len) == 0) {
ESP_LOGD(TAG, "Requested subprotocol supported: %s", s); ESP_LOGD(TAG, "Requested subprotocol supported: %s", s);
return true; return true;
} }
} while ((s = strtok_r(NULL, ", ", &rest)) != NULL); s = strtok_r(NULL, ", ", &rest);
}
ESP_LOGW(TAG, "Sec-WebSocket-Protocol %s not supported, supported subprotocol is %s", subprotocol, supported_subprotocol); ESP_LOGW(TAG, "Sec-WebSocket-Protocol %s not supported, supported subprotocol is %s", subprotocol, supported_subprotocol);