frame-xchg: Drop l_io read destroy handler
PATCH 1/1 frame-xchg: Drop l_io read destroy handler
This function was intended to catch socket errors and destroy the group but it would leak the l_io object if that happened, and if called on ordinary shutdown it could cause a crash. Since we're now assuming that the netlink socket operations never fail just remove it.
--- src/frame-xchg.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-)
src/frame-xchg.c +1 -14
@@ -361,19 +361,6 @@ static bool frame_watch_group_io_read(struct l_io *io, void *user_data)return true; } -static void frame_watch_group_io_destroy (void *user_data) -{ -struct watch_group *group = user_data; - - group->io =NULL ; - -if (l_queue_remove (watch_groups, group)) { -l_error ("Frame watch group socket closed" ); - -frame_watch_group_destroy (group); - } -} -static struct watch_group *frame_watch_group_new (uint64_t wdev_id,uint32_t id) { struct watch_group *group = l_new(struct watch_group, 1);
@@ -435,7 +422,7 @@ static struct watch_group *frame_watch_group_new(uint64_t wdev_id, uint32_t id)l_io_set_close_on_destroy (group->io, true);l_io_set_read_handler (group->io, frame_watch_group_io_read, group, - frame_watch_group_io_destroy); +NULL ); group->write_queue =l_queue_new ();return group;
Signature · 1 line
2.20.1
Denis Kenzior
AppliedHi Andrew,
Quoted 8 lines · Andrew Zaborowski
This function was intended to catch socket errors and destroy the group but it would leak the
l_ioobject if that happened, and if called on ordinary shutdown it could cause a crash. Since we're now assuming that the netlink socket operations never fail just remove it.--- src/frame-xchg.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-)
Applied, thanks.
Regards,
-Denis