swagtoy
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modules/pager_plain: Fix CID1039809 Dereference before null check 

Signed-off-by: Chris Michael <cp.michael@samsung.com>
This commit is contained in:
Chris Michael 2014-09-05 11:05:59 -04:00
parent 911bffd23e
commit 36bcc26085
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/modules/pager_plain/e_mod_main.c
View File

@ -1870,7 +1870,11 @@ _pager_window_cb_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __U
if (!pw) return;
if (pw->client->lock_user_location) return;
if ((pw->desk->pager->popup) && (!act_popup)) return;
if ((pw->desk) && (pw->desk->pager))
{
if ((pw->desk->pager->popup) && (!act_popup)) return;
}
/* prevent drag for a few pixels */
if (pw->drag.start)
{
@ -1882,7 +1886,8 @@ _pager_window_cb_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __U
if (((unsigned int)(dx * dx) + (unsigned int)(dy * dy)) <=
(resist * resist)) return;
pw->desk->pager->dragging = 1;
if ((pw->desk) && (pw->desk->pager))
pw->desk->pager->dragging = 1;
pw->drag.start = 0;
e_comp_object_effect_clip(pw->client->frame);
edje_object_signal_emit(pw->desk->o_desk, "e,action,drag,in", "e");