diff options
| author | Martin Pitt <martin.pitt@ubuntu.com> | 2009-10-05 09:31:21 +0200 |
|---|---|---|
| committer | Martin Pitt <martin.pitt@ubuntu.com> | 2009-10-05 09:31:21 +0200 |
| commit | 51c850d47e90e4ea38f2fea6ee106a99f024edfa (patch) | |
| tree | daed378b74838d2723aaeda185f09d937dfc744d | |
| parent | 8662b3d75c3793d97c316a59ee94e9ff70df1a28 (diff) | |
| download | consolekit-51c850d47e90e4ea38f2fea6ee106a99f024edfa.tar.gz | |
delete 08-fix-double-close.patch (obsolete)
| -rw-r--r-- | debian/patches/08-fix-double-close.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/debian/patches/08-fix-double-close.patch b/debian/patches/08-fix-double-close.patch deleted file mode 100644 index 7dc9daf..0000000 --- a/debian/patches/08-fix-double-close.patch +++ /dev/null @@ -1,31 +0,0 @@ -# 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); - |