emo/sysklogd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #52 from meta-ed/overread

Browse Source 
Prevent overread when scanning the message buffer

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg 2022-06-17 18:16:28 +02:00 committed by GitHub
commit 2d37cf2c28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/syslogd.c
View File

@ -1321,11 +1321,12 @@ void printsys(char *msg)
if (*p == '<') {
/* /proc/klog or *BSD /dev/klog */
p++;
buffer.pri = 0;
while (isdigit(*++p))
buffer.pri = 10 * buffer.pri + (*p - '0');
while (isdigit(*p))
buffer.pri = 10 * buffer.pri + (*p++ - '0');
if (*p == '>')
++p;
p++;
} else if (isdigit(*p)) {
/* Linux /dev/kmsg: "pri,seq#,msec,flag[,..];msg" */
time_t now;
@ -1334,8 +1335,8 @@ void printsys(char *msg)
buffer.pri = 0;
while (isdigit(*p))
buffer.pri = 10 * buffer.pri + (*p++ - '0');
p++; /* skip ',' */
if (*p == ',')
p++;
/* seq# */
while (isdigit(*p))
@ -1351,8 +1352,8 @@ void printsys(char *msg)
return;
}
sys_seqno = seqno;
p++; /* skip ',' */
if (*p == ',')
p++;
/* timestamp */
while (isdigit(*p))