diff options
Diffstat (limited to 'src/journal')
| -rw-r--r-- | src/journal/coredump.c | 3 | ||||
| -rw-r--r-- | src/journal/coredumpctl.c | 5 | ||||
| -rw-r--r-- | src/journal/journalctl.c | 3 | ||||
| -rw-r--r-- | src/journal/journald-native.c | 2 | ||||
| -rw-r--r-- | src/journal/stacktrace.c | 6 |
5 files changed, 9 insertions, 10 deletions
diff --git a/src/journal/coredump.c b/src/journal/coredump.c index 62483a2a05..7d94b145c9 100644 --- a/src/journal/coredump.c +++ b/src/journal/coredump.c @@ -512,8 +512,7 @@ static int compose_open_fds(pid_t pid, char **open_fds) { } errno = 0; - fclose(stream); - stream = NULL; + stream = safe_fclose(stream); if (errno != 0) return -errno; diff --git a/src/journal/coredumpctl.c b/src/journal/coredumpctl.c index 0fa427003b..0546290318 100644 --- a/src/journal/coredumpctl.c +++ b/src/journal/coredumpctl.c @@ -646,8 +646,9 @@ static int save_core(sd_journal *j, int fd, char **path, bool *unlink_temp) { fdf = open(filename, O_RDONLY | O_CLOEXEC); if (fdf < 0) { - log_error_errno(errno, "Failed to open %s: %m", filename); - r = -errno; + r = log_error_errno(errno, + "Failed to open %s: %m", + filename); goto error; } diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index d31ab1c6d7..576e4e4d03 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -1453,8 +1453,7 @@ static int setup_keys(void) { safe_close(fd); fd = mkostemp_safe(k, O_WRONLY|O_CLOEXEC); if (fd < 0) { - log_error_errno(errno, "Failed to open %s: %m", k); - r = -errno; + r = log_error_errno(errno, "Failed to open %s: %m", k); goto finish; } diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c index da3faef93e..3e8a7a05f6 100644 --- a/src/journal/journald-native.c +++ b/src/journal/journald-native.c @@ -184,6 +184,7 @@ void server_process_native_message( free(identifier); identifier = t; } + } else if (l >= 8 && startswith(p, "MESSAGE=")) { char *t; @@ -193,6 +194,7 @@ void server_process_native_message( free(message); message = t; } + } else if (l > strlen("OBJECT_PID=") && l < strlen("OBJECT_PID=") + DECIMAL_STR_MAX(pid_t) && startswith(p, "OBJECT_PID=") && diff --git a/src/journal/stacktrace.c b/src/journal/stacktrace.c index 706c08eac7..98a54ff269 100644 --- a/src/journal/stacktrace.c +++ b/src/journal/stacktrace.c @@ -177,8 +177,7 @@ int coredump_make_stack_trace(int fd, const char *executable, char **ret) { goto finish; } - fclose(c.f); - c.f = NULL; + c.f = safe_fclose(c.f); *ret = buf; buf = NULL; @@ -192,8 +191,7 @@ finish: if (c.elf) elf_end(c.elf); - if (c.f) - fclose(c.f); + safe_fclose(c.f); free(buf); |