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

cdma: prevent crash on modem removal (rh #571921)

Browse Source
This commit is contained in:
Dan Williams
2010-04-24 23:12:16 -07:00
parent 44deca2c5a
commit 01cb6360f8
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mm-generic-cdma.c
View File

@@ -1847,10 +1847,9 @@ simple_state_machine (MMModem *modem, GError *error, gpointer user_data)
const char *str; const char *str;
guint id; guint id;
if (error) { info->error = mm_modem_check_removed (modem, error);
info->error = g_error_copy (error); if (info->error)
goto out; goto out;
}
switch (state) { switch (state) {
case SIMPLE_STATE_BEGIN: case SIMPLE_STATE_BEGIN:
@@ -1885,6 +1884,7 @@ simple_state_machine (MMModem *modem, GError *error, gpointer user_data)
out: out:
if (info->error || state == SIMPLE_STATE_DONE) { if (info->error || state == SIMPLE_STATE_DONE) {
if (modem)
registration_cleanup (MM_GENERIC_CDMA (modem), 0, 0); registration_cleanup (MM_GENERIC_CDMA (modem), 0, 0);
mm_callback_info_schedule (info); mm_callback_info_schedule (info);
} }