From 15225b1e0be189d8ceeaecb6c8751fbabc4d8e6f Mon Sep 17 00:00:00 2001 From: ERAMOTO Masaya Date: Mon, 25 Sep 2017 13:30:56 +0900 Subject: [PATCH] client: Fix core dump when using set-advertise-name If repeating to set on/off with set-advertise-name after setting local name, and then may dump core by double free. This patch uses g_free() instead of free(). --- client/advertising.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/client/advertising.c b/client/advertising.c index b105da9a1..bfdebd5c6 100644 --- a/client/advertising.c +++ b/client/advertising.c @@ -547,8 +547,10 @@ void ad_advertise_name(DBusConnection *conn, bool value) ad.name = value; - if (!value) - free(ad.local_name); + if (!value) { + g_free(ad.local_name); + ad.local_name = NULL; + } g_dbus_emit_property_changed(conn, AD_PATH, AD_IFACE, "Includes"); } @@ -558,7 +560,7 @@ void ad_advertise_local_name(DBusConnection *conn, const char *name) if (ad.local_name && !strcmp(name, ad.local_name)) return; - free(ad.local_name); + g_free(ad.local_name); ad.local_name = strdup(name); g_dbus_emit_property_changed(conn, AD_PATH, AD_IFACE, "LocalName"); -- 2.47.3