Azreyo/Carbon
1
1
Fork 0
Code Actions Packages Projects Releases Wiki Activity

Fix potential buffer overflow in log_hexdump function

Browse Source
This commit is contained in:
Azreyo
2025-12-11 20:17:52 +01:00
parent 1b83097f00
commit 5d32e8c2e0
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/logging.c
View File

@@ -459,16 +459,27 @@ void log_hexdump(const char *label, const void *data, size_t len)
for (size_t i = 0; i < len; i += 16) { for (size_t i = 0; i < len; i += 16) {
int pos = snprintf(line, sizeof(line), "%04zx: ", i); int pos = snprintf(line, sizeof(line), "%04zx: ", i);
if (pos < 0) pos = 0;
if ((size_t) pos>= sizeof(line)) pos = sizeof(line) -1;
for (size_t j = 0; j < 16; j++) { for (size_t j = 0; j < 16; j++) {
if (i + j < len) { if (i + j < len) {
pos += snprintf(line + pos, sizeof(line) - pos, "%02x ", bytes[i + j]); int written = snprintf(line + pos, sizeof(line) - pos, "%02x ", bytes[i + j]);
if (written > 0 && (size_t)(pos + written) < sizeof(line)) {
pos += written;
} else {
pos = sizeof(line) -1;
}
ascii[j] = isprint(bytes[i + j]) ? bytes[i + j] : '.'; ascii[j] = isprint(bytes[i + j]) ? bytes[i + j] : '.';
} else { } else {
pos += snprintf(line + pos, sizeof(line) - pos, " "); int written = snprintf(line + pos, sizeof(line) - pos, " ");
if (written > 0 && (size_t)(pos + written)) {
pos += written;
} else {
ascii[j] = ' '; ascii[j] = ' ';
} }
} }
}
ascii[16] = '\0'; ascii[16] = '\0';
LOG_TRACE(LOG_CAT_GENERAL, "%s: %s |%s|", label, line, ascii); LOG_TRACE(LOG_CAT_GENERAL, "%s: %s |%s|", label, line, ascii);