core: free GError objects returned by glib

diff --git a/src/cbs.c b/src/cbs.c
index 9d75881..cf8fc10 100644 (file)
--- a/src/cbs.c
+++ b/src/cbs.c
@@ -743,6 +743,7 @@ static void cbs_got_file_contents(struct ofono_cbs *cbs)
                                                "Powered", &error);
 
        if (error) {
+               g_error_free(error);
                powered = TRUE;
                g_key_file_set_boolean(cbs->settings, SETTINGS_GROUP,
                                        "Powered", powered);

diff --git a/src/gprs.c b/src/gprs.c
index 5ea864c..691751c 100644 (file)
--- a/src/gprs.c
+++ b/src/gprs.c
@@ -2502,6 +2502,7 @@ static void gprs_load_settings(struct ofono_gprs *gprs, const char *imsi)
         * and RoamingAllowed = False
         */
        if (error) {
+               g_error_free(error);
                gprs->powered = TRUE;
                g_key_file_set_boolean(gprs->settings, SETTINGS_GROUP,
                                        "Powered", gprs->powered);
@@ -2514,6 +2515,7 @@ static void gprs_load_settings(struct ofono_gprs *gprs, const char *imsi)
                                                        &error);
 
        if (error) {
+               g_error_free(error);
                gprs->roaming_allowed = FALSE;
                g_key_file_set_boolean(gprs->settings, SETTINGS_GROUP,
                                        "RoamingAllowed",

diff --git a/src/sms.c b/src/sms.c
index 5f5779c..94789db 100644 (file)
--- a/src/sms.c
+++ b/src/sms.c
@@ -1761,6 +1761,7 @@ static void sms_load_settings(struct ofono_sms *sms, const char *imsi)
                                                "NextReference", &error);
 
        if (error || sms->ref > 65536) {
+               g_error_free(error);
                sms->ref = 1;
                g_key_file_set_integer(sms->settings, SETTINGS_GROUP,
                                        "NextReference", sms->ref);
@@ -1771,16 +1772,19 @@ static void sms_load_settings(struct ofono_sms *sms, const char *imsi)
                g_key_file_get_boolean(sms->settings, SETTINGS_GROUP,
                                        "UseDeliveryReports", &error);
 
-       if (error)
+       if (error) {
+               g_error_free(error);
                g_key_file_set_boolean(sms->settings, SETTINGS_GROUP,
                                        "UseDeliveryReports",
                                        sms->use_delivery_reports);
+       }
 
        error = NULL;
        sms->bearer = g_key_file_get_integer(sms->settings, SETTINGS_GROUP,
                                                        "Bearer", &error);
 
        if (error || sms_bearer_to_string(sms->bearer) == NULL) {
+               g_error_free(error);
                sms->bearer = 3; /* Default to CS then PS */
                g_key_file_set_integer(sms->settings, SETTINGS_GROUP,
                                        "Bearer", sms->bearer);
@@ -1791,6 +1795,7 @@ static void sms_load_settings(struct ofono_sms *sms, const char *imsi)
                                                "Alphabet", &error);
 
        if (error || sms_alphabet_to_string(sms->alphabet) == NULL) {
+               g_error_free(error);
                sms->alphabet = SMS_ALPHABET_DEFAULT;
                g_key_file_set_integer(sms->settings, SETTINGS_GROUP,
                                        "Aphabet", sms->alphabet);