Fix deref after null error

Change-Id: I8b877ceda0341994b340a5fefb5cf12adf7bce2f
Signed-off-by: Junkyeong, Kim <jk0430.kim@samsung.com>

diff --git a/src/e_mod_rdp.c b/src/e_mod_rdp.c
index 24646a3..d5c507e 100644 (file)
--- a/src/e_mod_rdp.c
+++ b/src/e_mod_rdp.c
@@ -999,8 +999,7 @@ _e_rdp_pixman_output_image_get_cursor(E_Rdp_Output *output, E_Hwc_Window *hwc_wi
         goto fail;
      }
 
-   if (hwc_window_cursor != NULL)
-     _e_rdp_pixman_output_image_composite_cursor(output, hwc_window_cursor, pix_surface, info.width, info.height, e_output_w, e_output_h);
+   _e_rdp_pixman_output_image_composite_cursor(output, hwc_window_cursor, pix_surface, info.width, info.height, e_output_w, e_output_h);
 
    tbm_surface_unmap(tbm_surface);
    tbm_surface_unmap(output->backup_tbm_surface);
@@ -1619,14 +1618,13 @@ e_rdp_client_activity(int fd, uint32_t mask, void *data)
      b->client_count--;
 
    output = b->output;
-   if (output && output->frame_timer)
-     {
-        ecore_timer_del(output->frame_timer);
-        output->frame_timer = NULL;
-     }
-
-   if (b->client_count == 0)
+   if (output && b->client_count == 0)
      {
+        if (output->frame_timer)
+          {
+             ecore_timer_del(output->frame_timer);
+             output->frame_timer = NULL;
+          }
         if (output->showing_surface)
           {
              pixman_image_unref(output->showing_surface);