jyapayne/musl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix the %m specifier in syslog

Browse source 
errno must be saved upon vsyslog entry, otherwise its value could be
changed by some libc function before reaching the %m handler in
vsnprintf.
This commit is contained in:
Clément Vasseur 2014-07-09 14:34:18 +02:00 • committed by Rich Felker
commit da27118157
1 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/misc/syslog.c
View file

@ -7,6 +7,7 @@
#include <signal.h> #include <signal.h>
#include <string.h> #include <string.h>
#include <pthread.h> #include <pthread.h>
#include <errno.h>
#include "libc.h" #include "libc.h"
#include "atomic.h" #include "atomic.h"
@ -76,6 +77,7 @@ static void _vsyslog(int priority, const char *message, va_list ap)
time_t now; time_t now;
struct tm tm; struct tm tm;
char buf[256]; char buf[256];
int errno_save = errno;
int pid; int pid;
int l, l2; int l, l2;
@ -93,6 +95,7 @@ static void _vsyslog(int priority, const char *message, va_list ap)
pid = (log_opt & LOG_PID) ? getpid() : 0; pid = (log_opt & LOG_PID) ? getpid() : 0;
l = snprintf(buf, sizeof buf, "<%d>%s %s%s%.0d%s: ", l = snprintf(buf, sizeof buf, "<%d>%s %s%s%.0d%s: ",
priority, timebuf, log_ident, "["+!pid, pid, "]"+!pid); priority, timebuf, log_ident, "["+!pid, pid, "]"+!pid);
errno = errno_save;
l2 = vsnprintf(buf+l, sizeof buf - l, message, ap); l2 = vsnprintf(buf+l, sizeof buf - l, message, ap);
if (l2 >= 0) { if (l2 >= 0) {
if (l2 >= sizeof buf - l) l = sizeof buf - 1; if (l2 >= sizeof buf - l) l = sizeof buf - 1;