wt/mongoose
1
0 Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2026-11-09 16:21:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

unbreak VC98 weird 64-bit handling

Browse Source
This commit is contained in:
Sergio R. Caprile committed 2026-11-09 12:00:04 -03:00
1 parent 528be76a23
commit 5b6c08acfb
2 files changed
+10 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

mongoose.c
+5 -5
View File
@@ -30530,11 +30530,11 @@ static size_t ws_process(uint8_t *buf, size_t len, struct ws_msg *msg,
msg->header_len = 4 + mask_len;
msg->data_len = (((size_t) buf[2]) << 8) | buf[3];
} else if (len >= 10 + mask_len) {
uint64_t data_len = ((uint64_t) be32(buf + 2) << 32) + be32(buf + 6);
// Sanity check, and integer overflow protection for the boundary check below
// data_len should not be larger than 1 GB
if (data_len > 1024 * 1024 * 1024) return 0;
msg->data_len = (size_t) data_len;
// Sanity check and protect the boundary check below: data_len should not
// be larger than 1 GB, so it fits in 32-bits
uint32_t hi = be32(buf + 2), lo = be32(buf + 6);
if (hi != 0 || lo > 1024U * 1024U * 1024U) return 0;
msg->data_len = (size_t) lo;
msg->header_len = 10 + mask_len;
}
}
src/ws.c
+5 -5
View File
@@ -79,11 +79,11 @@ static size_t ws_process(uint8_t *buf, size_t len, struct ws_msg *msg,
msg->header_len = 4 + mask_len;
msg->data_len = (((size_t) buf[2]) << 8) | buf[3];
} else if (len >= 10 + mask_len) {
uint64_t data_len = ((uint64_t) be32(buf + 2) << 32) + be32(buf + 6);
// Sanity check, and integer overflow protection for the boundary check below
// data_len should not be larger than 1 GB
if (data_len > 1024 * 1024 * 1024) return 0;
msg->data_len = (size_t) data_len;
// Sanity check and protect the boundary check below: data_len should not
// be larger than 1 GB, so it fits in 32-bits
uint32_t hi = be32(buf + 2), lo = be32(buf + 6);
if (hi != 0 || lo > 1024U * 1024U * 1024U) return 0;
msg->data_len = (size_t) lo;
msg->header_len = 10 + mask_len;
}
}