diff options
| author | Dan Williams <dcbw@redhat.com> | 2010-01-19 03:16:34 -0800 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2010-01-19 03:18:10 -0800 |
| commit | 50ad39b28e61adb3d9da178c47e41100f554adeb (patch) | |
| tree | 0dad5f389015412d5f6c0ecd02fd6ec6d486e9c4 /src/mm-callback-info.c | |
| parent | 73e10c77d37791ed4a1f51ee8c1007600ef24bde (diff) | |
core: protect against modem removal in critical callbacks (rh #553953)
There are more places to handle, but these are the most critical. If
the modem is removed while a command is in-progress, the mm-callback-info
code will set info->modem to NULL. Make sure we check for that in
callbacks and return a reasonable error. Previous code would just
blindly forge ahead and die on a null dereference.
Diffstat (limited to 'src/mm-callback-info.c')
| -rw-r--r-- | src/mm-callback-info.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mm-callback-info.c b/src/mm-callback-info.c index b554f79b..1882898a 100644 --- a/src/mm-callback-info.c +++ b/src/mm-callback-info.c @@ -11,6 +11,7 @@ * GNU General Public License for more details: * * Copyright (C) 2008 Novell, Inc. + * Copyright (C) 2009 - 2010 Red Hat, Inc. */ #include "mm-callback-info.h" @@ -55,8 +56,8 @@ modem_destroyed_cb (gpointer data, GObject *destroyed) info->modem = NULL; if (!info->pending_id) { info->error = g_error_new_literal (MM_MODEM_ERROR, - MM_MODEM_ERROR_GENERAL, - "The modem was removed or disabled."); + MM_MODEM_ERROR_REMOVED, + "The modem was removed."); mm_callback_info_schedule (info); } } |