[gtk+/gtk-2-24] pixbuf engine: Avoid a crash if widget is NULL



commit 1d0e2d58385bd01fdb753bf40ba2f4c32ccd0cc8
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Sep 29 16:05:57 2014 -0400

    pixbuf engine: Avoid a crash if widget is NULL
    
    Commit 85f2a721cf introduced an unconditional call to
    gtk_widget_get_direction(). This does not work for 'foreign'
    uses of the theme engine, e.g. in Qt, where widget is NULL.
    
    This was reported as a crash in Fedora here:
    https://bugzilla.redhat.com/show_bug.cgi?id=924683

 modules/engines/pixbuf/pixbuf-draw.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/modules/engines/pixbuf/pixbuf-draw.c b/modules/engines/pixbuf/pixbuf-draw.c
index 9239bd1..5448d81 100644
--- a/modules/engines/pixbuf/pixbuf-draw.c
+++ b/modules/engines/pixbuf/pixbuf-draw.c
@@ -131,7 +131,7 @@ draw_simple_image(GtkStyle       *style,
        match_data->orientation = GTK_ORIENTATION_HORIZONTAL;
     }
 
-  if (!(match_data->flags & THEME_MATCH_DIRECTION))
+  if (widget && !(match_data->flags & THEME_MATCH_DIRECTION))
     {
       match_data->flags |= THEME_MATCH_DIRECTION;
       match_data->direction = gtk_widget_get_direction (widget);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]