From a58a4bff451dcf8a6019aed1b2fb276e9836b0f4 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Thu, 2 Oct 2008 14:15:10 -0400 Subject: don't close the log file fd twice Fixes #17866 --- src/ck-event-logger.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/ck-event-logger.c b/src/ck-event-logger.c index 92bf987..1e2165b 100644 --- a/src/ck-event-logger.c +++ b/src/ck-event-logger.c @@ -180,8 +180,10 @@ retry: static void reopen_file_stream (CkEventLogger *event_logger) { - close (event_logger->priv->fd); - fclose (event_logger->priv->file); + /* fclose will also close the underlying fd */ + if (event_logger->priv->file != NULL) { + fclose (event_logger->priv->file); + } /* FIXME: retries */ open_log_file (event_logger); @@ -420,8 +422,8 @@ ck_event_logger_finalize (GObject *object) g_async_queue_unref (event_logger->priv->event_queue); } - if (event_logger->priv->fd != -1) { - close (event_logger->priv->fd); + if (event_logger->priv->file != NULL) { + fclose (event_logger->priv->file); } g_free (event_logger->priv->log_filename); -- cgit