From de0f00e8d19b001000e629ce903d46b32d0a50bb Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 14 Sep 2015 18:32:27 +0200 Subject: [PATCH] manager: avoid assertion in free_property_filter_data() #0 0x00007fc52202dd3b in g_logv (breakpoint=1) at gmessages.c:315 #1 0x00007fc52202dd3b in g_logv (log_domain=0x7fc522351b84 "GLib-GObject", log_level=G_LOG_LEVEL_CRITICAL, format=, args=args@entry=0x7ffeb818bfc0) at gmessages.c:1041 #2 0x00007fc52202deaf in g_log (log_domain=, log_level=, format=) at gmessages.c:1079 #3 0x000055c658ee819f in free_property_filter_data (pfd=0x55c65a009000) at nm-manager.c:4418 #4 0x000055c658ee7e67 in do_set_property_check (user_data=0x55c65a009000) at nm-manager.c:4515 #5 0x00007fc522026a8a in g_main_context_dispatch (context=0x55c659e161c0) at gmain.c:3122 #6 0x00007fc522026a8a in g_main_context_dispatch (context=context@entry=0x55c659e161c0) at gmain.c:3737 #7 0x00007fc522026e20 in g_main_context_iterate (context=0x55c659e161c0, block=block@entry=1, dispatch=dispatch@entry=1, self=) at gmain.c:3808 #8 0x00007fc522027142 in g_main_loop_run (loop=0x55c659e16280) at gmain.c:4002 #9 0x000055c658e047ee in main (argc=1, argv=0x7ffeb818c508) at main.c:449 Fixes: 751c67464387f1bfef2a18b257d75a3679ce73d9 --- src/nm-manager.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/nm-manager.c b/src/nm-manager.c index ed05b7932a..1f6c9f7031 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -4415,9 +4415,8 @@ free_property_filter_data (PropertyFilterData *pfd) g_object_unref (pfd->self); g_object_unref (pfd->connection); g_object_unref (pfd->message); - g_object_unref (pfd->subject); - if (pfd->object) - g_object_unref (pfd->object); + g_clear_object (&pfd->subject); + g_clear_object (&pfd->object); g_free (pfd->audit_prop_value); g_slice_free (PropertyFilterData, pfd); }