Skip to content

Commit c3858a8

Browse files
committed
Merge pull request #149 from acv/status-crash
Always null memory in pstr_t's buffer
2 parents cd99952 + eb0d73c commit c3858a8

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/debug.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,12 @@ _debug(const char *filename, int line, int level, const char *format, ...)
6060
va_end(vlist);
6161
fputc('\n', stderr);
6262
} else if (!config->daemon) {
63-
fprintf(stdout, "[%d][%.24s][%u](%s:%d) ", level, ctime_r(&ts, buf), getpid(),
63+
fprintf(stderr, "[%d][%.24s][%u](%s:%d) ", level, ctime_r(&ts, buf), getpid(),
6464
filename, line);
6565
va_start(vlist, format);
66-
vfprintf(stdout, format, vlist);
66+
vfprintf(stderr, format, vlist);
6767
va_end(vlist);
68-
fputc('\n', stdout);
69-
fflush(stdout);
68+
fputc('\n', stderr);
7069
}
7170

7271
if (config->log_syslog) {

src/pstring.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ pstr_new(void)
4747
new->len = 0;
4848
new->size = MAX_BUF;
4949
new->buf = (char *)safe_malloc(MAX_BUF);
50+
memset(new->buf, 0, MAX_BUF);
5051

5152
return new;
5253
}

0 commit comments

Comments
 (0)