# Description: Fix double close of the log file (->file is an fdopen(->priv), which occasionally causes segfaults.
# Ubuntu: https://bugs.launchpad.net/bugs/263245
# Upstream: https://bugs.freedesktop.org/show_bug.cgi?id=17866
# Upstream: http://gitweb.freedesktop.org/?p=ConsoleKit.git;a=commitdiff;h=a58a4bff451dcf8a6019aed1b2fb276e9836b0f4
--- 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 *objec
                 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);