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

sim-mbim: prevent potential leak when loading operator idenitifier and name

Browse Source 
This patch addresses a potential memory leak when
load_operator_identifier or load_operator_name in MMSimMbim 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-10 10:24:52 +01:00
committed by Aleksander Morgado
parent fc42b2df8c
commit ebadb6786a
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mm-sim-mbim.c
+16 -10
View File
@@ -207,9 +207,13 @@ load_operator_identifier_finish (MMSim *self,
GAsyncResult *res,
GError **error)
{
MbimProvider *provider;
if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error))
return NULL;
return (gchar *)g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (res));
provider = (MbimProvider *)g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (res));
return g_strdup (provider->provider_id);
}
static void
@@ -227,10 +231,9 @@ load_operator_identifier_ready (MbimDevice *device,
mbim_message_home_provider_response_parse (
response,
&provider,
&error)) {
g_simple_async_result_set_op_res_gpointer (simple, g_strdup (provider->provider_id), NULL);
mbim_provider_free (provider);
} else
&error))
g_simple_async_result_set_op_res_gpointer (simple, provider, (GDestroyNotify)mbim_provider_free);
else
g_simple_async_result_take_error (simple, error);
if (response)
@@ -271,9 +274,13 @@ load_operator_name_finish (MMSim *self,
GAsyncResult *res,
GError **error)
{
MbimProvider *provider;
if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error))
return NULL;
return (gchar *)g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (res));
provider = (MbimProvider *)g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (res));
return g_strdup (provider->provider_name);
}
static void
@@ -291,10 +298,9 @@ load_operator_name_ready (MbimDevice *device,
mbim_message_home_provider_response_parse (
response,
&provider,
&error)) {
g_simple_async_result_set_op_res_gpointer (simple, g_strdup (provider->provider_name), NULL);
mbim_provider_free (provider);
} else
&error))
g_simple_async_result_set_op_res_gpointer (simple, provider, (GDestroyNotify)mbim_provider_free);
else
g_simple_async_result_take_error (simple, error);
if (response)