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

Fix stack overflow in mg_hexdump

Browse Source 
PUBLISHED_FROM=5025692f3f4593b3ea38af51f8f49e1ac4df6b88
This commit is contained in:
Alexander Alashkin authored and Cesanta Bot committed 2016-11-16 17:36:14 +00:00
1 parent e4a4b6f260
commit f6165d23e4
1 file changed
+10 -5
Download Patch File Download Diff File Expand all files Collapse all files
mongoose.c
+10 -5
View File
@@ -8888,6 +8888,11 @@ struct mg_connection *mg_connect_ws(struct mg_mgr *mgr,
/* Amalgamated: #include "mongoose/src/internal.h" */ /* Amalgamated: #include "mongoose/src/internal.h" */
/* Amalgamated: #include "mongoose/src/util.h" */ /* Amalgamated: #include "mongoose/src/util.h" */
/* For platforms with limited libc */
#ifndef MAX
#define MAX(a,b) ((a) > (b)? (a): (b))
#endif
const char *mg_skip(const char *s, const char *end, const char *delims, const char *mg_skip(const char *s, const char *end, const char *delims,
struct mg_str *v) { struct mg_str *v) {
v->p = s; v->p = s;
@@ -9056,19 +9061,19 @@ int mg_hexdump(const void *buf, int len, char *dst, int dst_len) {
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
idx = i % 16; idx = i % 16;
if (idx == 0) { if (idx == 0) {
if (i > 0) n += snprintf(dst + n, dst_len - n, " %s\n", ascii); if (i > 0) n += snprintf(dst + n, MAX(dst_len - n, 0), " %s\n", ascii);
n += snprintf(dst + n, dst_len - n, "%04x ", i); n += snprintf(dst + n, MAX(dst_len - n, 0), "%04x ", i);
} }
if (dst_len - n < 0) { if (dst_len - n < 0) {
return n; return n;
} }
n += snprintf(dst + n, dst_len - n, " %02x", p[i]); n += snprintf(dst + n, MAX(dst_len - n, 0), " %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';
} }
while (i++ % 16) n += snprintf(dst + n, dst_len - n, "%s", " "); while (i++ % 16) n += snprintf(dst + n, MAX(dst_len - n, 0), "%s", " ");
n += snprintf(dst + n, dst_len - n, " %s\n\n", ascii); n += snprintf(dst + n, MAX(dst_len - n, 0), " %s\n\n", ascii);
return n; return n;
} }