app_server: add null check for dbus_state_set/elm_app_server_views_eet_new
authortaehyub <taehyub.kim@samsung.com>
Wed, 17 Jun 2015 12:19:31 +0000 (14:19 +0200)
committerCedric BAIL <cedric@osg.samsung.com>
Wed, 17 Jun 2015 13:59:19 +0000 (15:59 +0200)
Reviewers: Hermet, woohyun, raster, cedric

Reviewed By: cedric

Differential Revision: https://phab.enlightenment.org/D2705

Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
src/lib/elm_app_client_view.c
src/lib/elm_app_server.c

index 3ad1399..62fa1fd 100644 (file)
@@ -167,6 +167,8 @@ _dbus_state_set_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending *pendin
    void *user_data = eldbus_pending_data_del(pending, "user_data");
    const char *error = NULL, *error_message = NULL;
 
+   if (!cb) return;
+
    if (!eldbus_message_error_get(msg, &error, &error_message))
      error_message = NULL;
 
index 361b8a3..50e3043 100644 (file)
@@ -291,6 +291,8 @@ _elm_app_server_save(Eo *obj EINA_UNUSED, Elm_App_Server_Data *data)
 
    views_eet = elm_app_server_views_eet_new(1, NULL);
 
+   if (!views_eet) return;
+
    iter = eina_hash_iterator_data_new(data->views);
    EINA_ITERATOR_FOREACH(iter, view)
      {