summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorvivek <vivek.ellur@samsung.com>2015-01-05 09:09:02 -0500
committerChris Michael <cp.michael@samsung.com>2015-01-05 09:09:03 -0500
commitc5f6c3941ce11a521fbb4dfcb169e431196ca7a1 (patch)
tree5c691d11ec193c9c69e36948dc1af76329d3ab1e /src/modules
parent2db6ed09456e433877c5be191a18c84d216ae3f6 (diff)
ecore_evas_wayland: Add null check conditions in ecore evas wayland module
Summary: Added null check conditions to check ecore_evas pointer in various places of ecore evas wayland common module Signed-off-by: vivek <vivek.ellur@samsung.com> Reviewers: devilhorns Reviewed By: devilhorns Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D1812
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index 568a02cadf..fa3d9610f0 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -572,6 +572,7 @@ _ecore_evas_wl_common_free(Ecore_Evas *ee)
572 572
573 LOGFN(__FILE__, __LINE__, __FUNCTION__); 573 LOGFN(__FILE__, __LINE__, __FUNCTION__);
574 574
575 if (!ee) return;
575 wdata = ee->engine.data; 576 wdata = ee->engine.data;
576 if (wdata->frame_callback) wl_callback_destroy(wdata->frame_callback); 577 if (wdata->frame_callback) wl_callback_destroy(wdata->frame_callback);
577 wdata->frame_callback = NULL; 578 wdata->frame_callback = NULL;
@@ -595,6 +596,7 @@ _ecore_evas_wl_common_resize(Ecore_Evas *ee, int w, int h)
595 596
596 LOGFN(__FILE__, __LINE__, __FUNCTION__); 597 LOGFN(__FILE__, __LINE__, __FUNCTION__);
597 598
599 if (!ee) return;
598 if (w < 1) w = 1; 600 if (w < 1) w = 1;
599 if (h < 1) h = 1; 601 if (h < 1) h = 1;
600 602
@@ -1162,6 +1164,7 @@ _ecore_evas_wl_common_aspect_set(Ecore_Evas *ee, double aspect)
1162{ 1164{
1163 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1165 LOGFN(__FILE__, __LINE__, __FUNCTION__);
1164 1166
1167 if (!ee) return;
1165 if (ee->prop.aspect == aspect) return; 1168 if (ee->prop.aspect == aspect) return;
1166 ee->prop.aspect = aspect; 1169 ee->prop.aspect = aspect;
1167} 1170}
@@ -1182,6 +1185,7 @@ _ecore_evas_wl_common_object_cursor_set(Ecore_Evas *ee, Evas_Object *obj, int la
1182 Ecore_Evas_Engine_Wl_Data *wdata = ee->engine.data; 1185 Ecore_Evas_Engine_Wl_Data *wdata = ee->engine.data;
1183 Evas_Object *old; 1186 Evas_Object *old;
1184 1187
1188 if (!ee) return;
1185 old = ee->prop.cursor.object; 1189 old = ee->prop.cursor.object;
1186 if (obj == NULL) 1190 if (obj == NULL)
1187 { 1191 {
@@ -1335,6 +1339,7 @@ _ecore_evas_wl_common_pre_render(Ecore_Evas *ee)
1335 1339
1336 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1340 LOGFN(__FILE__, __LINE__, __FUNCTION__);
1337 1341
1342 if (!ee) return;
1338 if (ee->in_async_render) 1343 if (ee->in_async_render)
1339 { 1344 {
1340 /* EDBG("ee=%p is rendering asynchronously, skip", ee); */ 1345 /* EDBG("ee=%p is rendering asynchronously, skip", ee); */
@@ -1437,6 +1442,7 @@ _ecore_evas_wl_common_render(Ecore_Evas *ee)
1437 Ecore_Wl_Window *win = NULL; 1442 Ecore_Wl_Window *win = NULL;
1438 Ecore_Evas_Engine_Wl_Data *wdata; 1443 Ecore_Evas_Engine_Wl_Data *wdata;
1439 1444
1445 if (!ee) return;
1440 if (!(wdata = ee->engine.data)) return 0; 1446 if (!(wdata = ee->engine.data)) return 0;
1441 if (!(win = wdata->win)) return 0; 1447 if (!(win = wdata->win)) return 0;
1442 1448