Mercurial > hg > xemacs-beta
diff src/scrollbar-gtk.c @ 3482:20773f9b7bc0
[xemacs-hg @ 2006-06-29 16:58:59 by james]
Check scrollbar instance data for NULLness before dereferencing.
<m31wt77vcf.fsf@jerrypc.cs.usu.edu>
| author | james |
|---|---|
| date | Thu, 29 Jun 2006 16:59:00 +0000 |
| parents | b7f26b2f78bd |
| children | 16112448d484 |
line wrap: on
line diff
--- a/src/scrollbar-gtk.c Thu Jun 29 14:52:00 2006 +0000 +++ b/src/scrollbar-gtk.c Thu Jun 29 16:59:00 2006 +0000 @@ -56,14 +56,16 @@ static void gtk_free_scrollbar_instance (struct scrollbar_instance *instance) { - if (SCROLLBAR_GTK_WIDGET (instance)) + if (instance->scrollbar_data) { - gtk_widget_hide_all (SCROLLBAR_GTK_WIDGET (instance)); - gtk_widget_destroy (SCROLLBAR_GTK_WIDGET (instance)); + if (SCROLLBAR_GTK_WIDGET (instance)) + { + gtk_widget_hide_all (SCROLLBAR_GTK_WIDGET (instance)); + gtk_widget_destroy (SCROLLBAR_GTK_WIDGET (instance)); + } + + xfree (instance->scrollbar_data, void *); } - - if (instance->scrollbar_data) - xfree (instance->scrollbar_data, void *); } /* A device method. */