Skip to content

Commit

Permalink
fix for some compilers
Browse files Browse the repository at this point in the history
  • Loading branch information
sannysanoff committed Jan 28, 2024
1 parent 20690b3 commit a4e4ea2
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions misc_modules/tci_server/src/websocket.h
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ namespace websocket {
char reason[128] = { 0 };
if (pl_len >= 2) {
status_code = be16toh(*(uint16_t*)data);
uint64_t reason_len = std::min(sizeof(reason) - 1, pl_len - 2);
uint64_t reason_len = std::min<uint64_t>(sizeof(reason) - 1, pl_len - 2);
memcpy(reason, data + 2, reason_len);
reason[reason_len] = 0;
}
Expand Down Expand Up @@ -547,12 +547,12 @@ namespace websocket {
accept_checked = true;
}
else if (key_len == 22 && !memcmp(data, "Sec-WebSocket-Protocol", 22) && resp_protocol_size > 0) {
uint32_t cp_len = std::min(resp_protocol_size - 1, val_len);
uint32_t cp_len = std::min<uint32_t>(resp_protocol_size - 1, val_len);
memcpy(resp_protocol, val, cp_len);
resp_protocol[cp_len] = 0;
}
else if (key_len == 24 && !memcmp(data, "Sec-WebSocket-Extensions", 24) && resp_extensions_size > 0) {
uint32_t cp_len = std::min(resp_extensions_size - 1, val_len);
uint32_t cp_len = std::min<uint32_t>(resp_extensions_size - 1, val_len);
memcpy(resp_extensions, val, cp_len);
resp_extensions[cp_len] = 0;
}
Expand Down

0 comments on commit a4e4ea2

Please sign in to comment.