From 2bc0aef96460c7763685dc7426e63e7398214056 Mon Sep 17 00:00:00 2001 From: taehyub Date: Wed, 17 Jun 2015 14:19:31 +0200 Subject: [PATCH] app_server: add null check for dbus_state_set/elm_app_server_views_eet_new Reviewers: Hermet, woohyun, raster, cedric Reviewed By: cedric Differential Revision: https://phab.enlightenment.org/D2705 Signed-off-by: Cedric BAIL --- src/lib/elm_app_client_view.c | 2 ++ src/lib/elm_app_server.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/lib/elm_app_client_view.c b/src/lib/elm_app_client_view.c index 3ad1399..62fa1fd 100644 --- a/src/lib/elm_app_client_view.c +++ b/src/lib/elm_app_client_view.c @@ -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; diff --git a/src/lib/elm_app_server.c b/src/lib/elm_app_server.c index 361b8a3..50e3043 100644 --- a/src/lib/elm_app_server.c +++ b/src/lib/elm_app_server.c @@ -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) { -- 2.7.4