From 843087b51a53d8eab7463082b9761e4c037d3802 Mon Sep 17 00:00:00 2001 From: Szymon Janc Date: Thu, 9 Jan 2014 17:56:13 +0100 Subject: [PATCH] shared: Fix not calling destroy callback while clearing up handlers read/write_watch_destroy is be called after io_set_read/write_handler exits. This was resulting in io destroy callback being NULLem before destroy was called resulting in io destroy not being called at all. Fix this by assigning destroy callback only if setting non-NULL callback. destroy_watch will clean it when called. Fix following valgrind report: 168 (120 direct, 48 indirect) bytes in 1 blocks are definitely lost in loss record 34 of 36 at 0x4C2C494: calloc (in /usr/lib/valgrind/ vgpreload_memcheck-amd64-linux.so) by 0x409BAE: mgmt_new (mgmt.c:372) by 0x409D05: mgmt_new_default (mgmt.c:469) by 0x40E100: test_pre_setup (android-tester.c:371) by 0x40AD84: start_tester (tester.c:586) by 0x4E7C3B5: g_main_context_dispatch (in /lib/x86_64-linux-gnu/ libglib-2.0.so.0.3800.1) by 0x4E7C707: ??? (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.3800.1) by 0x4E7CB09: g_main_loop_run (in /lib/x86_64-linux-gnu/ libglib-2.0.so.0.3800.1) by 0x40B76C: tester_run (tester.c:784) by 0x4034F4: main (android-tester.c:2127) --- src/shared/io-glib.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/shared/io-glib.c b/src/shared/io-glib.c index 488b1a24f..77ba19e2f 100644 --- a/src/shared/io-glib.c +++ b/src/shared/io-glib.c @@ -189,10 +189,10 @@ bool io_set_read_handler(struct io *io, io_callback_func_t callback, if (io->read_watch == 0) return false; -done: - io->read_callback = callback; io->read_destroy = destroy; io->read_data = user_data; +done: + io->read_callback = callback; return true; } @@ -250,10 +250,10 @@ bool io_set_write_handler(struct io *io, io_callback_func_t callback, if (io->write_watch == 0) return false; -done: - io->write_callback = callback; io->write_destroy = destroy; io->write_data = user_data; +done: + io->write_callback = callback; return true; } -- 2.47.3