cinterion: check error returned by g_task_propagate_error instead

When returning an enum value via g_task_return_int, some code assumes
the enum value is always non-negative and thus considers that a negative
value implies an error. This assumption could be invalidated if a
negative value is later added to the enum. To make it less error prone
to future changes, this patch modifies the code to check if the GError
argument to g_task_propagate_error is populated instead.

1 files changed, 5 insertions, 1 deletions

diff --git a/plugins/cinterion/mm-broadband-modem-cinterion.c b/plugins/cinterion/mm-broadband-modem-cinterion.c
index c147c2f6..5f6b20f8 100644
--- a/plugins/cinterion/mm-broadband-modem-cinterion.c
+++ b/plugins/cinterion/mm-broadband-modem-cinterion.c
@@ -582,10 +582,14 @@ load_access_technologies_finish (MMIfaceModem             *self,
                                  guint                    *mask,
                                  GError                  **error)
 {
+    GError *inner_error = NULL;
     gssize val;
 
-    if ((val = g_task_propagate_int (G_TASK (res), error)) < 0)
+    val = g_task_propagate_int (G_TASK (res), &inner_error);
+    if (inner_error) {
+        g_propagate_error (error, inner_error);
         return FALSE;
+    }
 
     *access_technologies = (MMModemAccessTechnology) val;
     *mask = MM_MODEM_ACCESS_TECHNOLOGY_ANY;