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

sim: handle initialization failures properly

Browse Source 
We should't use MM_SIM() on possibly NULL values.
This commit is contained in:
Aleksander Morgado
2012-01-08 23:45:51 +01:00
parent 7db16d2279
commit a534afa84d
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/mm-sim.c
View File

@@ -33,8 +33,6 @@
#include "mm-log.h" #include "mm-log.h"
#include "mm-modem-helpers.h" #include "mm-modem-helpers.h"
typedef struct _InitAsyncContext InitAsyncContext;
static void interface_initialization_step (InitAsyncContext *ctx);
static void async_initable_iface_init (GAsyncInitableIface *iface); static void async_initable_iface_init (GAsyncInitableIface *iface);
G_DEFINE_TYPE_EXTENDED (MMSim, mm_sim, MM_GDBUS_TYPE_SIM_SKELETON, 0, G_DEFINE_TYPE_EXTENDED (MMSim, mm_sim, MM_GDBUS_TYPE_SIM_SKELETON, 0,
@@ -889,6 +887,8 @@ load_operator_name (MMSim *self,
/*****************************************************************************/ /*****************************************************************************/
typedef struct _InitAsyncContext InitAsyncContext;
static void interface_initialization_step (InitAsyncContext *ctx);
typedef enum { typedef enum {
INITIALIZATION_STEP_FIRST, INITIALIZATION_STEP_FIRST,
@@ -926,7 +926,13 @@ mm_sim_new_finish (GAsyncInitable *initable,
GAsyncResult *res, GAsyncResult *res,
GError **error) GError **error)
{ {
return MM_SIM (g_async_initable_new_finish (initable, res, error)); GObject *sim;
sim = g_async_initable_new_finish (initable, res, error);
if (!sim)
return NULL;
return MM_SIM (sim);
} }
static gboolean static gboolean