devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-29 22:46:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup: Cleanup log modul

Browse Source 
* _rotate_log_file(): guard against NULL mainlogfile before g_strdup/strlen
* log_stderr_init(): move dup2 after malloc checks to avoid fd leak on
  allocation failure.
  Also remove explicit close(STDERR_FILENO) before dup2
  since dup2 closes the target atomically. Close the fd returned by
  dup2 immediately.
This commit is contained in:
Michael Vetter
2026-02-27 22:13:14 +01:00
parent 35030b7a7e
commit 10ef8505f8
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/log.c
View File

@@ -76,6 +76,8 @@ enum {
static void static void
_rotate_log_file(void) _rotate_log_file(void)
{ {
if (!mainlogfile)
return;
auto_gchar gchar* log_file = g_strdup(mainlogfile); auto_gchar gchar* log_file = g_strdup(mainlogfile);
size_t len = strlen(log_file); size_t len = strlen(log_file);
auto_gchar gchar* log_file_new = malloc(len + 5); auto_gchar gchar* log_file_new = malloc(len + 5);
@@ -362,11 +364,6 @@ log_stderr_init(log_level_t level)
if (rc != 0) if (rc != 0)
goto err; goto err;
close(STDERR_FILENO);
rc = dup2(stderr_pipe[1], STDERR_FILENO);
if (rc < 0)
goto err_close;
rc = log_stderr_nonblock_set(stderr_pipe[0]) rc = log_stderr_nonblock_set(stderr_pipe[0])
?: log_stderr_nonblock_set(stderr_pipe[1]); ?: log_stderr_nonblock_set(stderr_pipe[1]);
if (rc != 0) if (rc != 0)
@@ -374,15 +371,21 @@ log_stderr_init(log_level_t level)
stderr_buf = malloc(STDERR_BUFSIZE); stderr_buf = malloc(STDERR_BUFSIZE);
stderr_msg = g_string_sized_new(STDERR_BUFSIZE); stderr_msg = g_string_sized_new(STDERR_BUFSIZE);
stderr_level = level;
stderr_inited = 1;
prof_add_shutdown_routine(_log_stderr_close);
if (stderr_buf == NULL || stderr_msg == NULL) { if (stderr_buf == NULL || stderr_msg == NULL) {
errno = ENOMEM; errno = ENOMEM;
goto err_free; goto err_free;
} }
int dup_fd = dup2(stderr_pipe[1], STDERR_FILENO);
if (dup_fd < 0)
goto err_free;
close(dup_fd);
stderr_level = level;
stderr_inited = 1;
prof_add_shutdown_routine(_log_stderr_close);
return; return;
err_free: err_free: