From 2ca6d6285696d09d7a0f8bad3a551e6af0dd9be1 Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Fri, 7 Sep 2012 13:13:14 +0200 Subject: [PATCH] broadband-modem: clear error properly as it may be re-used Avoids this kind of issues: [mm-sms-list.c:334] mm_sms_list_take_part(): SMS part at 'me/0' is from a singlepart SMS [mm-iface-modem-messaging.c:475] sms_added(): Added received SMS at '/org/freedesktop/ModemManager1/SMS/31' [mm-broadband-modem.c:4791] sms_pdu_part_list_ready(): Error parsing PDU (1): PDU too short (2): 41 < 79 GLib-WARNING **: GError set over the top of a previous GError or uninitialized memory. This indicates a bug in someone's code. You must ensure an error is NULL before it's set. The overwriting error message was: PDU too short (3): 28 < (210 + 14), user data length: '203' [mm-broadband-modem.c:4791] sms_pdu_part_list_ready(): Error parsing PDU (2): PDU too short (3): 28 < (210 + 14), user data length: '203' --- src/mm-broadband-modem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c index 2b2debd8..14c0d40c 100644 --- a/src/mm-broadband-modem.c +++ b/src/mm-broadband-modem.c @@ -4789,7 +4789,7 @@ sms_pdu_part_list_ready (MMBroadbandModem *self, } else { /* Don't treat the error as critical */ mm_dbg ("Error parsing PDU (%d): %s", idx, error->message); - g_error_free (error); + g_clear_error (&error); } }