luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-29 08:56:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-memory-leak' into 'master'

Browse Source 
inotify: Fix a memory leak

Closes #2311

See merge request GNOME/glib!2128
This commit is contained in:
Philip Withnall 2021-06-04 10:53:38 +00:00
commit 8e6214aa30
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gio/inotify/inotify-path.c
View File

@ -208,6 +208,7 @@ ip_watched_file_free (ip_watched_file_t *file)
g_assert (file->subs == NULL); g_assert (file->subs == NULL);
g_free (file->filename); g_free (file->filename);
g_free (file->path); g_free (file->path);
g_free (file);
} }
static void static void

8
gio/tests/testfilemonitor.c
View File

@ -4,8 +4,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <gio/gio.h> #include <gio/gio.h>
#include "glib/glib-private.h"
/* These tests were written for the inotify implementation. /* These tests were written for the inotify implementation.
* Other implementations may require slight adjustments in * Other implementations may require slight adjustments in
* the tests, e.g. the length of timeouts * the tests, e.g. the length of timeouts
@ -957,11 +955,6 @@ static void
test_file_hard_links (Fixture *fixture, test_file_hard_links (Fixture *fixture,
gconstpointer user_data) 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; GError *error = NULL;
TestData data; TestData data;
@ -1012,7 +1005,6 @@ test_file_hard_links (Fixture *fixture,
g_object_unref (data.monitor); g_object_unref (data.monitor);
g_object_unref (data.file); g_object_unref (data.file);
g_object_unref (data.output_stream); g_object_unref (data.output_stream);
#endif
} }
int int