Call va_start/va_end for each call to vfprintf
Obtained from: OpenBSD
This commit is contained in:
parent
3f22a03fa6
commit
90d259217c
@ -306,10 +306,10 @@ log_Printf(int lev, const char *fmt,...)
|
|||||||
va_list ap;
|
va_list ap;
|
||||||
struct prompt *prompt;
|
struct prompt *prompt;
|
||||||
|
|
||||||
va_start(ap, fmt);
|
|
||||||
if (log_IsKept(lev)) {
|
if (log_IsKept(lev)) {
|
||||||
char nfmt[200];
|
char nfmt[200];
|
||||||
|
|
||||||
|
va_start(ap, fmt);
|
||||||
if (promptlist && (log_IsKept(lev) & LOG_KEPT_LOCAL)) {
|
if (promptlist && (log_IsKept(lev) & LOG_KEPT_LOCAL)) {
|
||||||
if ((log_IsKept(LogTUN) & LOG_KEPT_LOCAL) && LogTunno != -1)
|
if ((log_IsKept(LogTUN) & LOG_KEPT_LOCAL) && LogTunno != -1)
|
||||||
snprintf(nfmt, sizeof nfmt, "%s%d: %s: %s", TUN_NAME,
|
snprintf(nfmt, sizeof nfmt, "%s%d: %s: %s", TUN_NAME,
|
||||||
@ -324,7 +324,9 @@ log_Printf(int lev, const char *fmt,...)
|
|||||||
if (lev > LogMAXCONF || (prompt->logmask & MSK(lev)))
|
if (lev > LogMAXCONF || (prompt->logmask & MSK(lev)))
|
||||||
prompt_vPrintf(prompt, nfmt, ap);
|
prompt_vPrintf(prompt, nfmt, ap);
|
||||||
}
|
}
|
||||||
|
va_end(ap);
|
||||||
|
|
||||||
|
va_start(ap, fmt);
|
||||||
if ((log_IsKept(lev) & LOG_KEPT_SYSLOG) &&
|
if ((log_IsKept(lev) & LOG_KEPT_SYSLOG) &&
|
||||||
(lev != LogWARN || !log_PromptContext)) {
|
(lev != LogWARN || !log_PromptContext)) {
|
||||||
if ((log_IsKept(LogTUN) & LOG_KEPT_SYSLOG) && LogTunno != -1)
|
if ((log_IsKept(LogTUN) & LOG_KEPT_SYSLOG) && LogTunno != -1)
|
||||||
@ -334,8 +336,8 @@ log_Printf(int lev, const char *fmt,...)
|
|||||||
snprintf(nfmt, sizeof nfmt, "%s: %s", log_Name(lev), fmt);
|
snprintf(nfmt, sizeof nfmt, "%s: %s", log_Name(lev), fmt);
|
||||||
vsyslog(syslogLevel(lev), nfmt, ap);
|
vsyslog(syslogLevel(lev), nfmt, ap);
|
||||||
}
|
}
|
||||||
|
va_end(ap);
|
||||||
}
|
}
|
||||||
va_end(ap);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
Loading…
x
Reference in New Issue
Block a user