On 28/06/13 06:51, Ben Chan wrote:
> This patch fixes a potential crash when
> MMIfaceModem::load_current_bands_ready() dereferences a NULL GError
> pointer, which happens when the altair-lte plugin fails to load the
> current bands but does not propagate the error. It also fixes a similar
> issue with the plugin fails to load the supported bands, even though
> MMIfaceModem::load_supported_bands_ready() checks for a NULL GError
> pointer.
Pushed, thanks.
> ---
> plugins/altair/mm-broadband-modem-altair-lte.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/plugins/altair/mm-broadband-modem-altair-lte.c
> b/plugins/altair/mm-broadband-modem-altair-lte.c
> index 4eeae1c..a2ae2ba 100644
> --- a/plugins/altair/mm-broadband-modem-altair-lte.c
> +++ b/plugins/altair/mm-broadband-modem-altair-lte.c
> @@ -286,7 +286,9 @@ load_supported_bands_finish (MMIfaceModem *self,
> GAsyncResult *res,
> GError **error)
> {
> - /* Never fails */
> + if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res),
> error))
> + return NULL;
> +
> return (GArray *) g_array_ref (g_simple_async_result_get_op_res_gpointer
> (
> G_SIMPLE_ASYNC_RESULT (res)));
> }
> @@ -365,7 +367,9 @@ load_current_bands_finish (MMIfaceModem *self,
> GAsyncResult *res,
> GError **error)
> {
> - /* Never fails */
> + if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res),
> error))
> + return NULL;
> +
> return (GArray *) g_array_ref (g_simple_async_result_get_op_res_gpointer
> (
> G_SIMPLE_ASYNC_RESULT (res)));
> }
>
--
Aleksander
_______________________________________________
networkmanager-list mailing list
[email protected]
https://mail.gnome.org/mailman/listinfo/networkmanager-list
