From 1b0b0d5a38fb1ef17688d6545c1970e40b9dd6fd Mon Sep 17 00:00:00 2001 From: InHong Han Date: Fri, 21 May 2021 17:20:41 +0900 Subject: [PATCH] Fix issue detected by static analysis tool double_free: Calling g_variant_iter_free frees pointer info_iter which has already been freed. pass_freed_arg: Passing freed pointer keyword_iter as an argument to g_variant_iter_free. Change-Id: I9517519228317fbf921f5bef60641146c20ff72d --- client/src/sticker_dbus.c | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/client/src/sticker_dbus.c b/client/src/sticker_dbus.c index 75c1a89..a36cfaa 100644 --- a/client/src/sticker_dbus.c +++ b/client/src/sticker_dbus.c @@ -179,13 +179,6 @@ static void _handle_sticker_consumer_cb(GDBusConnection *connection, g_variant_get(parameters, "(ia{iv}a(s))", &event_type, &info_iter, &keyword_iter); _get_sticker_info_from_gvariant(info_iter, keyword_iter, sticker_data); consumer_handle->event_cb((sticker_consumer_event_type_e)event_type, sticker_data, consumer_handle->event_cb_user_data); - - if (info_iter) - g_variant_iter_free(info_iter); - - if (keyword_iter) - g_variant_iter_free(keyword_iter); - sticker_data_destroy(sticker_data); } } @@ -619,12 +612,6 @@ int sticker_dbus_update_sticker_info(GDBusConnection *gdbus_connection, sticker_ g_variant_get(reply_body, "(a{iv}a(s))", &info_iter, &keyword_iter); _get_sticker_info_from_gvariant(info_iter, keyword_iter, origin_data); - - if (info_iter) - g_variant_iter_free(info_iter); - - if (keyword_iter) - g_variant_iter_free(keyword_iter); } else { LOGW("failed to get sticker info"); free(origin_data); @@ -781,12 +768,6 @@ int sticker_dbus_get_sticker_info_by_record_id(GDBusConnection *gdbus_connection if (reply_body) g_variant_unref(reply_body); - - if (info_iter) - g_variant_iter_free(info_iter); - - if (keyword_iter) - g_variant_iter_free(keyword_iter); } if (reply) @@ -1132,12 +1113,6 @@ int sticker_dbus_get_sticker_info_by_uri(GDBusConnection *gdbus_connection, stic if (reply_body) g_variant_unref(reply_body); - - if (info_iter) - g_variant_iter_free(info_iter); - - if (keyword_iter) - g_variant_iter_free(keyword_iter); } if (reply) -- 2.7.4