nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Handle vsnprintf overflows (Thanks Han)

This commit is contained in:
Michael Stapelberg 2011-12-30 01:25:50 +01:00
parent 9a46335e25
commit 68544a519e
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/log.c
View File

@ -194,9 +194,15 @@ static void vlog(const bool print, const char *fmt, va_list args) {
vprintf(fmt, args); vprintf(fmt, args);
} else { } else {
len += vsnprintf(message + len, sizeof(message) - len, fmt, args); len += vsnprintf(message + len, sizeof(message) - len, fmt, args);
if (len == sizeof(message)) { if (len < 0 ) {
fprintf(stderr, "BUG: something is overflowing here. Dropping the log entry\n");
return;
}
if (len >= sizeof(message)) {
fprintf(stderr, "BUG: single log message > 4k\n"); fprintf(stderr, "BUG: single log message > 4k\n");
} }
/* If there is no space for the current message (plus trailing /* If there is no space for the current message (plus trailing
* nullbyte) in the ringbuffer, we need to wrap and write to the * nullbyte) in the ringbuffer, we need to wrap and write to the
* beginning again. */ * beginning again. */