colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hso: fix connections with username/password after e3c87e4e14

Browse Source 
e3c87e4e14 introduced a use-after-free
bug that causes passwords and usernames to be corrupted.
This commit is contained in:
Dan Williams
2010-03-12 08:57:55 -08:00
parent 749f9c0eb5
commit e055bd72db
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/mm-modem-hso.c
View File

@@ -141,8 +141,10 @@ _internal_hso_modem_authenticate (MMModemHso *self, MMCallbackInfo *info)
g_assert (primary); g_assert (primary);
cid = hso_get_cid (self); cid = hso_get_cid (self);
g_warn_if_fail (cid >= 0);
if (!priv->username && !priv->password) /* Both user and password are required; otherwise firmware returns an error */
if (!priv->username || !priv->password)
command = g_strdup_printf ("%s=%d,0", auth_commands[priv->auth_idx], cid); command = g_strdup_printf ("%s=%d,0", auth_commands[priv->auth_idx], cid);
else { else {
command = g_strdup_printf ("%s=%d,1,\"%s\",\"%s\"", command = g_strdup_printf ("%s=%d,1,\"%s\",\"%s\"",
@@ -367,14 +369,13 @@ do_connect (MMModem *modem,
gpointer user_data) gpointer user_data)
{ {
MMModemHso *self = MM_MODEM_HSO (modem); MMModemHso *self = MM_MODEM_HSO (modem);
MMModemHsoPrivate *priv = MM_MODEM_HSO_GET_PRIVATE (self); MMCallbackInfo *auth_info, *connect_info;
MMCallbackInfo *info;
mm_modem_set_state (modem, MM_MODEM_STATE_CONNECTING, MM_MODEM_STATE_REASON_NONE); mm_modem_set_state (modem, MM_MODEM_STATE_CONNECTING, MM_MODEM_STATE_REASON_NONE);
info = mm_callback_info_new (modem, callback, user_data); connect_info = mm_callback_info_new (modem, callback, user_data);
auth_info = mm_callback_info_new (modem, connect_auth_done, connect_info);
mm_hso_modem_authenticate (self, priv->username, priv->password, connect_auth_done, info); _internal_hso_modem_authenticate (self, auth_info);
} }
/*****************************************************************************/ /*****************************************************************************/