[glib: 1/2] inotify: Fix a memory leak
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib: 1/2] inotify: Fix a memory leak
- Date: Fri, 4 Jun 2021 10:53:40 +0000 (UTC)
commit df500c68a4d0741d1d6cf8ec3f8039a0d1f4b174
Author: Gaƫl Bonithon <gael xfce org>
Date: Tue Jun 1 17:43:45 2021 +0200
inotify: Fix a memory leak
Fixes: #2311
gio/inotify/inotify-path.c | 1 +
gio/tests/testfilemonitor.c | 8 --------
2 files changed, 1 insertion(+), 8 deletions(-)
---
diff --git a/gio/inotify/inotify-path.c b/gio/inotify/inotify-path.c
index f0528f443..e1129cd72 100644
--- a/gio/inotify/inotify-path.c
+++ b/gio/inotify/inotify-path.c
@@ -208,6 +208,7 @@ ip_watched_file_free (ip_watched_file_t *file)
g_assert (file->subs == NULL);
g_free (file->filename);
g_free (file->path);
+ g_free (file);
}
static void
diff --git a/gio/tests/testfilemonitor.c b/gio/tests/testfilemonitor.c
index b7f4a380d..a52ade715 100644
--- a/gio/tests/testfilemonitor.c
+++ b/gio/tests/testfilemonitor.c
@@ -4,8 +4,6 @@
#include <stdlib.h>
#include <gio/gio.h>
-#include "glib/glib-private.h"
-
/* These tests were written for the inotify implementation.
* Other implementations may require slight adjustments in
* the tests, e.g. the length of timeouts
@@ -957,11 +955,6 @@ static void
test_file_hard_links (Fixture *fixture,
gconstpointer user_data)
{
-#ifdef _GLIB_ADDRESS_SANITIZER
- g_test_incomplete ("FIXME: Leaks an inotify data structure, see glib#2311");
- (void) file_hard_links_output;
- (void) file_hard_links_step;
-#else
GError *error = NULL;
TestData data;
@@ -1012,7 +1005,6 @@ test_file_hard_links (Fixture *fixture,
g_object_unref (data.monitor);
g_object_unref (data.file);
g_object_unref (data.output_stream);
-#endif
}
int
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]