summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortaehyub <taehyub.kim@samsung.com>2015-06-17 14:19:31 +0200
committerCedric BAIL <cedric@osg.samsung.com>2015-06-17 15:59:19 +0200
commit2bc0aef96460c7763685dc7426e63e7398214056 (patch)
tree86907e1373d005e7b83ffe84dff01f66c68b7cd7
parentc9a36897b14e1674d9b7b7024bbdfcce9a5313e4 (diff)
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 <cedric@osg.samsung.com>
-rw-r--r--src/lib/elm_app_client_view.c2
-rw-r--r--src/lib/elm_app_server.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/lib/elm_app_client_view.c b/src/lib/elm_app_client_view.c
index 3ad1399c1..62fa1fd46 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
167 void *user_data = eldbus_pending_data_del(pending, "user_data"); 167 void *user_data = eldbus_pending_data_del(pending, "user_data");
168 const char *error = NULL, *error_message = NULL; 168 const char *error = NULL, *error_message = NULL;
169 169
170 if (!cb) return;
171
170 if (!eldbus_message_error_get(msg, &error, &error_message)) 172 if (!eldbus_message_error_get(msg, &error, &error_message))
171 error_message = NULL; 173 error_message = NULL;
172 174
diff --git a/src/lib/elm_app_server.c b/src/lib/elm_app_server.c
index 361b8a356..50e3043f1 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)
291 291
292 views_eet = elm_app_server_views_eet_new(1, NULL); 292 views_eet = elm_app_server_views_eet_new(1, NULL);
293 293
294 if (!views_eet) return;
295
294 iter = eina_hash_iterator_data_new(data->views); 296 iter = eina_hash_iterator_data_new(data->views);
295 EINA_ITERATOR_FOREACH(iter, view) 297 EINA_ITERATOR_FOREACH(iter, view)
296 { 298 {