From bfa5fd660c9b66aa91acfa9268c5c41ba1e8fdac Mon Sep 17 00:00:00 2001
From: Aleksander Morgado <aleksander@aleksander.es>
Date: Sat, 5 Jul 2014 07:06:05 +0200
Subject: iface-modem-cdma: disallow empty carrier code in automatic activation

---
 src/mm-iface-modem-cdma.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'src')

diff --git a/src/mm-iface-modem-cdma.c b/src/mm-iface-modem-cdma.c
index 1d460389..dd15c46a 100644
--- a/src/mm-iface-modem-cdma.c
+++ b/src/mm-iface-modem-cdma.c
@@ -135,6 +135,17 @@ handle_activate_auth_ready (MMBaseModem *self,
         return;
     }
 
+    /* Error if carrier code is empty */
+    if (!ctx->carrier || !ctx->carrier[0]) {
+        g_dbus_method_invocation_return_error (ctx->invocation,
+                                               MM_CORE_ERROR,
+                                               MM_CORE_ERROR_INVALID_ARGS,
+                                               "Cannot perform OTA activation: "
+                                               "invalid empty carrier code");
+        handle_activate_context_free (ctx);
+        return;
+    }
+
     modem_state = MM_MODEM_STATE_UNKNOWN;
     g_object_get (self,
                   MM_IFACE_MODEM_STATE, &modem_state,
-- 
cgit v1.2.3-70-g09d2