colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

broadband-modem-mbim: prevent potential leak when scanning networks

Browse Source 
This patch addresses a potential memory leak when scan_networks in
MMBroadbandModemMbim is called but the caller does not provide a
GAsyncReadyCallback.

Reported by Aleksander Morgado <aleksander@lanedo.com>
This commit is contained in:
Ben Chan
2013-12-09 15:07:26 -08:00
committed by Aleksander Morgado
parent ebadb6786a
commit 4c213d460e
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/mm-broadband-modem-mbim.c
View File

@@ -2308,10 +2308,25 @@ modem_3gpp_scan_networks_finish (MMIfaceModem3gpp *self,
GAsyncResult *res, GAsyncResult *res,
GError **error) GError **error)
{ {
MbimMessage *response;
MbimProvider **providers;
guint n_providers;
GList *info_list = NULL;
if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error)) if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error))
return NULL; return NULL;
return g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (res)); response = (MbimMessage *)g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (res));
if (mbim_message_command_done_get_result (response, error) &&
mbim_message_visible_providers_response_parse (response,
&n_providers,
&providers,
error)) {
info_list = mm_3gpp_network_info_list_from_mbim_providers ((const MbimProvider *const *)providers,
n_providers);
mbim_provider_array_free (providers);
}
return info_list;
} }
static void static void
@@ -2321,28 +2336,13 @@ visible_providers_query_ready (MbimDevice *device,
{ {
MbimMessage *response; MbimMessage *response;
GError *error = NULL; GError *error = NULL;
MbimProvider **providers;
guint n_providers;
response = mbim_device_command_finish (device, res, &error); response = mbim_device_command_finish (device, res, &error);
if (response && if (response)
mbim_message_command_done_get_result (response, &error) && g_simple_async_result_set_op_res_gpointer (simple, response, (GDestroyNotify)mbim_message_unref);
mbim_message_visible_providers_response_parse ( else
response,
&n_providers,
&providers,
&error)) {
GList *info_list;
info_list = mm_3gpp_network_info_list_from_mbim_providers ((const MbimProvider *const *)providers,
n_providers);
g_simple_async_result_set_op_res_gpointer (simple, info_list, NULL);
mbim_provider_array_free (providers);
} else
g_simple_async_result_take_error (simple, error); g_simple_async_result_take_error (simple, error);
if (response)
mbim_message_unref (response);
g_simple_async_result_complete (simple); g_simple_async_result_complete (simple);
g_object_unref (simple); g_object_unref (simple);
} }