add extra NULL check for tooltipsdata to avoid code fiddling with

2007-09-24  Kristian Rietveld  <kris@imendio.com>

	* gtk/gtktooltips.c (gtk_tooltips_set_tip): add extra NULL check
	for tooltipsdata to avoid code fiddling with active_tips_data
	from crashing.  (Fixes #460194, Peter Wright, Matthijs De Smedt).

svn path=/trunk/; revision=18864

diff --git a/ChangeLog b/ChangeLog
index db4180ad02f75f209d9b65be005fc93cd6eb2b19..2f79c0c9f3c5b78e384262a3786910c1a585e482 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-24  Kristian Rietveld  <kris@imendio.com>
+
+       * gtk/gtktooltips.c (gtk_tooltips_set_tip): add extra NULL check
+       for tooltipsdata to avoid code fiddling with active_tips_data
+       from crashing.  (Fixes #460194, Peter Wright, Matthijs De Smedt).
+
 2007-09-24  Matthias Clasen <mclasen@redhat.com>
 
        * modules/printbackends/file/gtkprintbackendfile.c: Correct a comment.

diff --git a/gtk/gtktooltips.c b/gtk/gtktooltips.c
index 1a539738677890aa2561c33316552dac4c1d999c..fe7a045790ce53909aa0ccc30729c16ff326b9d6 100644 (file)
--- a/gtk/gtktooltips.c
+++ b/gtk/gtktooltips.c
@@ -230,6 +230,7 @@ gtk_tooltips_set_tip (GtkTooltips *tooltips,
     }
   
   if (tooltips->active_tips_data 
+      && tooltipsdata
       && tooltips->active_tips_data->widget == widget
       && GTK_WIDGET_DRAWABLE (tooltips->active_tips_data->widget))
     {