[EGIT] [core/efl] master 09/09: ecore wl2 - fix null checing of drag offer - coverity

[Carsten Haitzler]

raster pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=9ee741cf7fb5ff4f71bc041ee9cdaadf5000d8d3

commit 9ee741cf7fb5ff4f71bc041ee9cdaadf5000d8d3
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date:   Thu Sep 28 15:23:05 2017 +0900

    ecore wl2 - fix null checing of drag offer - coverity
    
    fix CID 1378629
---
 src/lib/ecore_wl2/ecore_wl2_dnd.c | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/lib/ecore_wl2/ecore_wl2_dnd.c 
b/src/lib/ecore_wl2/ecore_wl2_dnd.c
index 4a170843ab..b3fcb458e6 100644
--- a/src/lib/ecore_wl2/ecore_wl2_dnd.c
+++ b/src/lib/ecore_wl2/ecore_wl2_dnd.c
@@ -253,22 +253,21 @@ _ecore_wl2_dnd_enter(Ecore_Wl2_Input *input, struct 
wl_data_offer *offer, struct
      {
         input->drag.offer = wl_data_offer_get_user_data(offer);
 
-        input->drag.offer->serial = serial;
-        input->drag.offer->window_id = window->id;
-
-        if (input->display->wl.data_device_manager_version >=
-            WL_DATA_OFFER_SET_ACTIONS_SINCE_VERSION)
+        if (input->drag.offer)
           {
-             if (input->drag.offer)
+             input->drag.offer->serial = serial;
+             input->drag.offer->window_id = window->id;
+
+             if (input->display->wl.data_device_manager_version >=
+                 WL_DATA_OFFER_SET_ACTIONS_SINCE_VERSION)
                ecore_wl2_offer_actions_set(input->drag.offer,
-                  ECORE_WL2_DRAG_ACTION_MOVE | ECORE_WL2_DRAG_ACTION_COPY,
-                  ECORE_WL2_DRAG_ACTION_MOVE);
+                                           ECORE_WL2_DRAG_ACTION_MOVE |
+                                           ECORE_WL2_DRAG_ACTION_COPY,
+                                           ECORE_WL2_DRAG_ACTION_MOVE);
           }
      }
-   else
-     {
-        input->drag.offer = NULL;
-     }
+   else input->drag.offer = NULL;
+
    input->drag.enter_serial = serial;
    input->drag.window_id = window->id;
 

--