wt/mongoose
1
0 Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2026-10-30 12:50:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2827 from cesanta/ws

Browse Source 
handle possible memory trashing on mg_send() and mg_iobuf_add() failures
This commit is contained in:
Sergio R. Caprile authored and GitHub committed 2024-07-09 15:01:36 -03:00
2 parents ad3acf355e 7f7c1ff6c2
commit 59cd4004ac
2 files changed
+16 -16
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

mongoose.c
+8 -8
View File
@@ -16603,9 +16603,9 @@ size_t mg_ws_send(struct mg_connection *c, const void *buf, size_t len,
int op) { int op) {
uint8_t header[14]; uint8_t header[14];
size_t header_len = mkhdr(len, op, c->is_client, header); size_t header_len = mkhdr(len, op, c->is_client, header);
mg_send(c, header, header_len); if (!mg_send(c, header, header_len)) return 0;
if (!mg_send(c, buf, len)) return header_len;
MG_VERBOSE(("WS out: %d [%.*s]", (int) len, (int) len, buf)); MG_VERBOSE(("WS out: %d [%.*s]", (int) len, (int) len, buf));
mg_send(c, buf, len);
mg_ws_mask(c, len); mg_ws_mask(c, len);
return header_len + len; return header_len + len;
} }
@@ -16757,12 +16757,12 @@ size_t mg_ws_wrap(struct mg_connection *c, size_t len, int op) {
size_t header_len = mkhdr(len, op, c->is_client, header); size_t header_len = mkhdr(len, op, c->is_client, header);
// NOTE: order of operations is important! // NOTE: order of operations is important!
mg_iobuf_add(&c->send, c->send.len, NULL, header_len); if (mg_iobuf_add(&c->send, c->send.len, NULL, header_len) != 0) {
p = &c->send.buf[c->send.len - len]; // p points to data p = &c->send.buf[c->send.len - len]; // p points to data
memmove(p, p - header_len, len); // Shift data memmove(p, p - header_len, len); // Shift data
memcpy(p - header_len, header, header_len); // Prepend header memcpy(p - header_len, header, header_len); // Prepend header
mg_ws_mask(c, len); // Mask data mg_ws_mask(c, len); // Mask data
}
return c->send.len; return c->send.len;
} }
src/ws.c
+8 -8
View File
@@ -133,9 +133,9 @@ size_t mg_ws_send(struct mg_connection *c, const void *buf, size_t len,
int op) { int op) {
uint8_t header[14]; uint8_t header[14];
size_t header_len = mkhdr(len, op, c->is_client, header); size_t header_len = mkhdr(len, op, c->is_client, header);
mg_send(c, header, header_len); if (!mg_send(c, header, header_len)) return 0;
if (!mg_send(c, buf, len)) return header_len;
MG_VERBOSE(("WS out: %d [%.*s]", (int) len, (int) len, buf)); MG_VERBOSE(("WS out: %d [%.*s]", (int) len, (int) len, buf));
mg_send(c, buf, len);
mg_ws_mask(c, len); mg_ws_mask(c, len);
return header_len + len; return header_len + len;
} }
@@ -287,11 +287,11 @@ size_t mg_ws_wrap(struct mg_connection *c, size_t len, int op) {
size_t header_len = mkhdr(len, op, c->is_client, header); size_t header_len = mkhdr(len, op, c->is_client, header);
// NOTE: order of operations is important! // NOTE: order of operations is important!
mg_iobuf_add(&c->send, c->send.len, NULL, header_len); if (mg_iobuf_add(&c->send, c->send.len, NULL, header_len) != 0) {
p = &c->send.buf[c->send.len - len]; // p points to data p = &c->send.buf[c->send.len - len]; // p points to data
memmove(p, p - header_len, len); // Shift data memmove(p, p - header_len, len); // Shift data
memcpy(p - header_len, header, header_len); // Prepend header memcpy(p - header_len, header, header_len); // Prepend header
mg_ws_mask(c, len); // Mask data mg_ws_mask(c, len); // Mask data
}
return c->send.len; return c->send.len;
} }