diff options
| author | Chris Michael <cp.michael@samsung.com> | 2014-09-05 11:05:59 -0400 |
|---|---|---|
| committer | Chris Michael <cp.michael@samsung.com> | 2014-09-05 11:05:59 -0400 |
| commit | 36bcc26085057c2610275efb47a4890199a6e9b3 (patch) | |
| tree | e3d5ac8b40d283b013532741f817441645401fab | |
| parent | 911bffd23e283a59bc2608cffd1e7f67ecf55e9d (diff) | |
| download | enlightenment-36bcc26085057c2610275efb47a4890199a6e9b3.tar.gz | |
modules/pager_plain: Fix CID1039809 Dereference before null check
Signed-off-by: Chris Michael <cp.michael@samsung.com>
| -rw-r--r-- | src/modules/pager_plain/e_mod_main.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/modules/pager_plain/e_mod_main.c b/src/modules/pager_plain/e_mod_main.c index 5f344a1abd..d559c41306 100644 --- a/src/modules/pager_plain/e_mod_main.c +++ b/src/modules/pager_plain/e_mod_main.c @@ -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"); |