Commit 0d047a35 authored by Matthias Clasen's avatar Matthias Clasen Committed by Matthias Clasen
Browse files

Don't leak pixbuf in some cases. (#317611, Tommi Komulainen)

2005-09-30  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkimage.c (gtk_image_expose): Don't leak pixbuf in
	some cases.  (#317611, Tommi Komulainen)
parent 51c6eb96
2005-09-30 Matthias Clasen <mclasen@redhat.com> 2005-09-30 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkimage.c (gtk_image_expose): Don't leak pixbuf in
some cases. (#317611, Tommi Komulainen)
* gtk/gtksocket-x11.c (_gtk_socket_windowing_size_request): * gtk/gtksocket-x11.c (_gtk_socket_windowing_size_request):
Prevent overflow when storing size hints in an unsigned Prevent overflow when storing size hints in an unsigned
short variable. Tracked down by Ray Strode and Søren Sandmann. short variable. Tracked down by Ray Strode and Søren Sandmann.
......
2005-09-30 Matthias Clasen <mclasen@redhat.com> 2005-09-30 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkimage.c (gtk_image_expose): Don't leak pixbuf in
some cases. (#317611, Tommi Komulainen)
* gtk/gtksocket-x11.c (_gtk_socket_windowing_size_request): * gtk/gtksocket-x11.c (_gtk_socket_windowing_size_request):
Prevent overflow when storing size hints in an unsigned Prevent overflow when storing size hints in an unsigned
short variable. Tracked down by Ray Strode and Søren Sandmann. short variable. Tracked down by Ray Strode and Søren Sandmann.
......
...@@ -1784,9 +1784,6 @@ gtk_image_expose (GtkWidget *widget, ...@@ -1784,9 +1784,6 @@ gtk_image_expose (GtkWidget *widget,
image_bound.height, image_bound.height,
GDK_RGB_DITHER_NORMAL, GDK_RGB_DITHER_NORMAL,
0, 0); 0, 0);
g_object_unref (pixbuf);
pixbuf = NULL;
} }
} }
else else
...@@ -1829,6 +1826,9 @@ gtk_image_expose (GtkWidget *widget, ...@@ -1829,6 +1826,9 @@ gtk_image_expose (GtkWidget *widget,
gdk_gc_set_clip_origin (widget->style->black_gc, 0, 0); gdk_gc_set_clip_origin (widget->style->black_gc, 0, 0);
} }
if (pixbuf)
g_object_unref (pixbuf);
} /* if widget is drawable */ } /* if widget is drawable */
return FALSE; return FALSE;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment