From d01bca493dad933b9df51bec1254c79089ffa1c7 Mon Sep 17 00:00:00 2001
From: Aleksander Morgado <aleksander@aleksander.es>
Date: Sun, 21 Mar 2021 13:05:27 +0100
Subject: cinterion: make sure FALSE sets GError in provcfg_response_to_cid()

The g_regex_match_full() method may return FALSE without setting the
GError, so that case needs to be considered.

Reported by Jan Mazura.

Fixes https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/issues/347
---
 .../cinterion/tests/test-modem-helpers-cinterion.c | 27 ++++++++++++++++++----
 1 file changed, 22 insertions(+), 5 deletions(-)

(limited to 'plugins/cinterion/tests/test-modem-helpers-cinterion.c')

diff --git a/plugins/cinterion/tests/test-modem-helpers-cinterion.c b/plugins/cinterion/tests/test-modem-helpers-cinterion.c
index 25e08473..8ea7d909 100644
--- a/plugins/cinterion/tests/test-modem-helpers-cinterion.c
+++ b/plugins/cinterion/tests/test-modem-helpers-cinterion.c
@@ -1602,45 +1602,57 @@ test_smoni_response_to_signal (void)
 typedef struct {
     const gchar            *str;
     MMCinterionModemFamily  modem_family;
-    gdouble                 expected_cid;
+    gboolean                success;
+    guint                   expected_cid;
 } ProvcfgResponseTest;
 
-
 static const ProvcfgResponseTest provcfg_response_tests[] = {
     {
 
         .str          = "^SCFG: \"MEopMode/Prov/Cfg\",\"vdfde\"",
         .modem_family = MM_CINTERION_MODEM_FAMILY_DEFAULT,
+        .success      = TRUE,
         .expected_cid = 1,
     },
     {
 
         .str          = "* ^SCFG: \"MEopMode/Prov/Cfg\",\"attus\"",
         .modem_family = MM_CINTERION_MODEM_FAMILY_IMT,
+        .success      = TRUE,
         .expected_cid = 1,
     },
     {
 
         .str          = "* ^SCFG: \"MEopMode/Prov/Cfg\",\"2\"",
         .modem_family = MM_CINTERION_MODEM_FAMILY_DEFAULT,
+        .success      = TRUE,
         .expected_cid = 3,
     },
     {
 
         .str          = "* ^SCFG: \"MEopMode/Prov/Cfg\",\"vzwdcus\"",
         .modem_family = MM_CINTERION_MODEM_FAMILY_DEFAULT,
+        .success      = TRUE,
         .expected_cid = 3,
     },
     {
 
         .str          = "* ^SCFG: \"MEopMode/Prov/Cfg\",\"tmode\"",
         .modem_family = MM_CINTERION_MODEM_FAMILY_DEFAULT,
+        .success      = TRUE,
         .expected_cid = 2,
     },
     {
         .str          = "* ^SCFG: \"MEopMode/Prov/Cfg\",\"fallback*\"",
         .modem_family = MM_CINTERION_MODEM_FAMILY_DEFAULT,
+        .success      = TRUE,
         .expected_cid = 1,
+    },
+    {
+        /* commas not allowed by the regex */
+        .str          = "* ^SCFG: \"MEopMode/Prov/Cfg\",\"something,with,commas\"",
+        .modem_family = MM_CINTERION_MODEM_FAMILY_DEFAULT,
+        .success      = FALSE,
     }
 };
 
@@ -1660,9 +1672,14 @@ test_provcfg_response (void)
                                                        NULL,
                                                        &cid,
                                                        &error);
-        g_assert_no_error (error);
-        g_assert (result);
-        g_assert_cmpuint (cid, ==, provcfg_response_tests[i].expected_cid);
+        if (provcfg_response_tests[i].success) {
+            g_assert_no_error (error);
+            g_assert (result);
+            g_assert_cmpuint (cid, ==, provcfg_response_tests[i].expected_cid);
+        } else {
+            g_assert (error);
+            g_assert (!result);
+        }
     }
 }
 
-- 
cgit v1.2.3-70-g09d2