From 1b34fe6c514e319bfac66e1edb89798c7c411979 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Sun, 1 Dec 2013 14:15:13 -0600 Subject: [PATCH] broadband-bearer-qmi: ensure errors are cleared before re-using them If the bearer doesn't have one of IPv4 or IPv6 configuration, then the qmi_message_wds_get_current_settings_output_get_ip*_address() functions will return FALSE with a filled error, which was not cleared. This fixes a glib warning message about overwriting an already-filled GError. --- src/mm-bearer-qmi.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/mm-bearer-qmi.c b/src/mm-bearer-qmi.c index fef58819..a8341db9 100644 --- a/src/mm-bearer-qmi.c +++ b/src/mm-bearer-qmi.c @@ -344,6 +344,9 @@ get_current_settings_ready (QmiClientWds *client, success = qmi_message_wds_get_current_settings_output_get_secondary_ipv4_dns_address (output, &addr, &error); print_address4 (success, " DNS #2", addr, error); g_clear_error (&error); + } else { + /* no IPv4 configuration */ + g_clear_error (&error); } /* If the message has an IPv6 address, print IPv6 settings */ @@ -368,6 +371,9 @@ get_current_settings_ready (QmiClientWds *client, success = qmi_message_wds_get_current_settings_output_get_ipv6_secondary_dns_address (output, &array, &error); print_address6 (success, " DNS #2", array, 0, error); g_clear_error (&error); + } else { + /* no IPv6 configuration */ + g_clear_error (&error); } /* Domain names */