diff options
author | Martin Pitt <martin.pitt@ubuntu.com> | 2014-04-23 16:25:51 +0200 |
---|---|---|
committer | Martin Pitt <martin.pitt@ubuntu.com> | 2014-04-23 16:26:08 +0200 |
commit | 855762949d44e9b87c5dfee335355fb87cb3c4fe (patch) | |
tree | c91a29bad0954374351faa8569e502246f9ac5c1 | |
parent | bf93ff2b4d75dd44cd29fe7450c5d921ac5cfd18 (diff) | |
download | consolekit-855762949d44e9b87c5dfee335355fb87cb3c4fe.tar.gz |
03-cleanup_console_tags.patch: call g_dir_close() when we're done
Fixes a small memory leak.
-rw-r--r-- | debian/changelog | 8 | ||||
-rw-r--r-- | debian/patches/03-cleanup_console_tags.patch | 11 |
2 files changed, 14 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index e79e398..b0b8d04 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +consolekit (0.4.6-4) UNRELEASED; urgency=medium + + [ Steve Langasek ] + * 03-cleanup_console_tags.patch: call g_dir_close() when we're done, fixing + a small memory leak. + + -- Martin Pitt <mpitt@debian.org> Wed, 23 Apr 2014 16:25:06 +0200 + consolekit (0.4.6-3) unstable; urgency=low * Upload to unstable. diff --git a/debian/patches/03-cleanup_console_tags.patch b/debian/patches/03-cleanup_console_tags.patch index 2ceb955..fca530f 100644 --- a/debian/patches/03-cleanup_console_tags.patch +++ b/debian/patches/03-cleanup_console_tags.patch @@ -2,9 +2,9 @@ Cleanup console tag files on application startup and shutdown. Index: consolekit/src/main.c =================================================================== ---- consolekit.orig/src/main.c 2010-11-17 07:02:23.030817878 +0100 -+++ consolekit/src/main.c 2010-11-17 07:03:17.434814872 +0100 -@@ -148,6 +148,43 @@ +--- consolekit.orig/src/main.c 2014-04-23 16:24:25.864069678 +0200 ++++ consolekit/src/main.c 2014-04-23 16:24:46.320069405 +0200 +@@ -148,6 +148,44 @@ unlink (CONSOLE_KIT_PID_FILE); } @@ -36,6 +36,7 @@ Index: consolekit/src/main.c + } + g_free (file); + } ++ g_dir_close (dir); +} + +static void @@ -48,7 +49,7 @@ Index: consolekit/src/main.c /* copied from nautilus */ static int debug_log_pipes[2]; -@@ -228,7 +265,7 @@ +@@ -228,7 +266,7 @@ snprintf (pid, sizeof (pid), "%lu\n", (long unsigned) getpid ()); written = write (pf, pid, strlen (pid)); close (pf); @@ -57,7 +58,7 @@ Index: consolekit/src/main.c } else { g_warning ("Unable to write pid file %s: %s", CONSOLE_KIT_PID_FILE, -@@ -317,6 +354,8 @@ +@@ -317,6 +355,8 @@ goto out; } |