[Xfce4-commits] [xfce/xfdesktop] 01/01: Avoid crash: do not clean up data to be used (#14609)

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

a   n   d   r   e       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository xfce/xfdesktop.

commit bbfdae9b69a5fcc5156c1633b385ba6cb81ef4c1
Author: Andre Miranda <andreldm at xfce.org>
Date:   Fri Jan 4 22:51:10 2019 -0300

    Avoid crash: do not clean up data to be used (#14609)
    
    Rationale: https://bugzilla.xfce.org/show_bug.cgi?id=14609#c4
---
 src/xfce-backdrop.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/xfce-backdrop.c b/src/xfce-backdrop.c
index f8bdc2b..503ba43 100644
--- a/src/xfce-backdrop.c
+++ b/src/xfce-backdrop.c
@@ -1711,10 +1711,8 @@ xfce_backdrop_loader_size_prepared_cb(GdkPixbufLoader *loader,
         return;
     }
 
-    /* invalid backdrop? quit */
+    /* invalid backdrop? quit but don't free image data */
     if(!XFCE_IS_BACKDROP(backdrop)) {
-        xfce_backdrop_image_data_release(image_data);
-        g_free(image_data);
         return;
     }
 
@@ -1785,9 +1783,11 @@ xfce_backdrop_loader_closed_cb(GdkPixbufLoader *loader,
 
     TRACE("entering");
 
-    g_return_if_fail(XFCE_IS_BACKDROP(backdrop));
+    /* invalid backdrop? just quit */
+    if(!XFCE_IS_BACKDROP(backdrop))
+        return;
 
-    /* canceled? quit now */
+    /* canceled? free data and quit now */
     if(g_cancellable_is_cancelled(image_data->cancellable)) {
         xfce_backdrop_image_data_release(image_data);
         g_free(image_data);

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.