32 lines
1.0 KiB
Diff
32 lines
1.0 KiB
Diff
|
From f52e1f5c91a02b581abaad312134740d590c4270 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Zhipeng Xie <xiezhipeng1@huawei.com>
|
||
|
|
Date: Tue, 10 Apr 2018 11:46:38 +0800
|
||
|
|
Subject: [PATCH] Fix double free for data.channel
|
||
|
|
|
||
|
|
Signed-off-by: Zhipeng Xie <xiezhipeng1@huawei.com>
|
||
|
|
---
|
||
|
|
dbus/dbus-binding-tool-glib.c | 2 ++
|
||
|
|
1 file changed, 2 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/dbus/dbus-binding-tool-glib.c b/dbus/dbus-binding-tool-glib.c
|
||
|
|
index ff0bb47..6d1c032 100644
|
||
|
|
--- a/dbus/dbus-binding-tool-glib.c
|
||
|
|
+++ b/dbus/dbus-binding-tool-glib.c
|
||
|
|
@@ -870,11 +870,13 @@ dbus_binding_tool_output_glib_server (BaseInfo *info, GIOChannel *channel, const
|
||
|
|
ret = FALSE;
|
||
|
|
g_io_channel_shutdown (data.channel, TRUE, error);
|
||
|
|
g_io_channel_unref (data.channel);
|
||
|
|
+ data.channel = NULL;
|
||
|
|
goto io_lose;
|
||
|
|
}
|
||
|
|
|
||
|
|
g_io_channel_shutdown (data.channel, TRUE, error);
|
||
|
|
g_io_channel_unref (data.channel);
|
||
|
|
+ data.channel = NULL;
|
||
|
|
|
||
|
|
/* Now spawn glib-genmarshal to insert all our required marshallers */
|
||
|
|
argv = g_ptr_array_new ();
|
||
|
|
--
|
||
|
|
1.7.12.4
|
||
|
|
|