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

Merge branch 'fix/ws_transport_linux_signed_promotions_v5.2' into 'release/v5.2'

Browse Source 
fix(ws_transport): Fix incorrect packet-len on linux due to int promotions of char (GitHub PR) (v5.2)

See merge request espressif/esp-idf!34147
This commit is contained in:
Jiang Jiang Jian
2024-10-25 19:04:08 +08:00
parent 1a389cc288 226fde9f91
commit 0e2f30a253
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/tcp_transport/transport_ws.c
View File

@ -502,7 +502,7 @@ static int ws_read_header(esp_transport_handle_t t, char *buffer, int len, int t
ESP_LOGE(TAG, "Error read data"); ESP_LOGE(TAG, "Error read data");
return rlen; return rlen;
} }
payload_len = data_ptr[0] << 8 | data_ptr[1]; payload_len = (uint8_t)data_ptr[0] << 8 | (uint8_t)data_ptr[1];
} else if (payload_len == 127) { } else if (payload_len == 127) {
// headerLen += 8; // headerLen += 8;
header = 8; header = 8;
@ -515,7 +515,7 @@ static int ws_read_header(esp_transport_handle_t t, char *buffer, int len, int t
// really too big! // really too big!
payload_len = 0xFFFFFFFF; payload_len = 0xFFFFFFFF;
} else { } else {
payload_len = data_ptr[4] << 24 | data_ptr[5] << 16 | data_ptr[6] << 8 | data_ptr[7]; payload_len = (uint8_t)data_ptr[4] << 24 | (uint8_t)data_ptr[5] << 16 | (uint8_t)data_ptr[6] << 8 | data_ptr[7];
} }
} }