30 lines
1023 B
Diff
30 lines
1023 B
Diff
|
From f1f9af528f71f42ac41bb7a272f4f7d940fd3a0f Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Pavel=20B=C5=99ezina?= <pbrezina@redhat.com>
|
||
|
|
Date: Wed, 12 Sep 2018 13:24:27 +0200
|
||
|
|
Subject: [PATCH 43/83] sbus: free watch_fd->fdevent explicitly
|
||
|
|
|
||
|
|
We never reproduced this with gdb but valgrind shows invalid read in sbus_watch_handler
|
||
|
|
after the watch_fd was freed. This should not be needed since watch_fd is memory parent
|
||
|
|
of fdevent but it seems to help.
|
||
|
|
|
||
|
|
Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
|
||
|
|
---
|
||
|
|
src/sbus/connection/sbus_watch.c | 1 +
|
||
|
|
1 file changed, 1 insertion(+)
|
||
|
|
|
||
|
|
diff --git a/src/sbus/connection/sbus_watch.c b/src/sbus/connection/sbus_watch.c
|
||
|
|
index 3898311..0e4bd01 100644
|
||
|
|
--- a/src/sbus/connection/sbus_watch.c
|
||
|
|
+++ b/src/sbus/connection/sbus_watch.c
|
||
|
|
@@ -280,6 +280,7 @@ sbus_watch_remove(DBusWatch *dbus_watch, void *data)
|
||
|
|
|
||
|
|
if (watch_fd->dbus_watch.read == NULL
|
||
|
|
&& watch_fd->dbus_watch.write == NULL) {
|
||
|
|
+ talloc_free(watch_fd->fdevent);
|
||
|
|
talloc_free(watch_fd);
|
||
|
|
}
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.9.5
|
||
|
|
|