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.
This commit is contained in:
Dan Williams
2010-01-19 03:16:34 -08:00
parent 73e10c77d3
commit 50ad39b28e
7 changed files with 128 additions and 75 deletions

View File

@@ -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);
}
}