simono41/shellinabox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Issue #381: Fixed segfaults at logging

Browse source 
* This patch correctly handles varargs being used two times in the
  same function.
This commit is contained in:
Luka Krajger 2016-06-06 16:11:11 +02:00
parent cbac76e579
commit e6c25e84bc
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
logging/logging.c
View file

@ -100,7 +100,11 @@ void error(const char *fmt, ...) {
va_start(ap, fmt); va_start(ap, fmt);
debugMsg(MSG_ERROR, fmt, ap); debugMsg(MSG_ERROR, fmt, ap);
#ifdef HAVE_SYSLOG_H #ifdef HAVE_SYSLOG_H
vsyslog(LOG_ERR, fmt, ap); va_list apSyslog;
va_copy(apSyslog, ap);
va_start(apSyslog, fmt);
vsyslog(LOG_ERR, fmt, apSyslog);
va_end(apSyslog);
#endif #endif
va_end(ap); va_end(ap);
} }
@ -117,7 +121,11 @@ void fatal(const char *fmt, ...) {
va_start(ap, fmt); va_start(ap, fmt);
debugMsg(MSG_QUIET, fmt, ap); debugMsg(MSG_QUIET, fmt, ap);
#ifdef HAVE_SYSLOG_H #ifdef HAVE_SYSLOG_H
vsyslog(LOG_CRIT, fmt, ap); va_list apSyslog;
va_copy(apSyslog, ap);
va_start(apSyslog, fmt);
vsyslog(LOG_CRIT, fmt, apSyslog);
va_end(apSyslog);
syslog(LOG_CRIT, "[server] Aborting..."); syslog(LOG_CRIT, "[server] Aborting...");
#endif #endif
va_end(ap); va_end(ap);