Skip to content

M
mongoose
Commit 48057977 authored by Marko Mikulicic's avatar Marko Mikulicic Committed by Cesanta Bot
Browse files
Options

Fix hexdump memory overflow 

PUBLISHED_FROM=a6f3f33432ce43b6d4462de623ba61a53e7f18df
parent 4c038508
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 1 deletion
mongoose.c
View file @ 48057977
...@@ -8667,6 +8667,9 @@ int mg_hexdump(const void *buf, int len, char *dst, int dst_len) { ...@@ -8667,6 +8667,9 @@ int mg_hexdump(const void *buf, int len, char *dst, int dst_len) {
if (i > 0) n += snprintf(dst + n, dst_len - n, " %s\n", ascii); if (i > 0) n += snprintf(dst + n, dst_len - n, " %s\n", ascii);
n += snprintf(dst + n, dst_len - n, "%04x ", i); n += snprintf(dst + n, dst_len - n, "%04x ", i);
} }
if (dst_len - n < 0) {
return n;
}
n += snprintf(dst + n, dst_len - n, " %02x", p[i]); n += snprintf(dst + n, dst_len - n, " %02x", p[i]);
ascii[idx] = p[i] < 0x20 || p[i] > 0x7e ? '.' : p[i]; ascii[idx] = p[i] < 0x20 || p[i] > 0x7e ? '.' : p[i];
ascii[idx + 1] = '\0'; ascii[idx + 1] = '\0';
...@@ -10787,7 +10790,8 @@ void mg_tun_log_frame(struct mg_tun_frame *frame) { ...@@ -10787,7 +10790,8 @@ void mg_tun_log_frame(struct mg_tun_frame *frame) {
#if MG_ENABLE_HEXDUMP #if MG_ENABLE_HEXDUMP
{ {
char hex[512]; char hex[512];
mg_hexdump(frame->body.p, frame->body.len, hex, sizeof(hex)); mg_hexdump(frame->body.p, frame->body.len, hex, sizeof(hex) - 1);
hex[sizeof(hex) - 1] = '\0';
LOG(LL_DEBUG, ("body:\n%s", hex)); LOG(LL_DEBUG, ("body:\n%s", hex));
} }
#else #else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment