summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Morgado <aleksander@aleksander.es>2014-07-05 07:06:05 +0200
committerAleksander Morgado <aleksander@aleksander.es>2014-07-05 07:06:05 +0200
commit07e4135061c4ba66ce47ef14b8f42e2d764b801d (patch)
tree1d491537b073db10c49190fda257e94ca3783741
parent0152b6be984f3fa3562104b9aa5d2d518e46bd7c (diff)
downloadModemManager-aleksander/cdma-at-activation.tar.gz
iface-modem-cdma: disallow empty carrier code in automatic activationaleksander/cdma-at-activation
-rw-r--r--src/mm-iface-modem-cdma.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/mm-iface-modem-cdma.c b/src/mm-iface-modem-cdma.c
index 853f1dbc0..aa0fda33c 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,