callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't leak pixbuf on error.

Browse Source 
* io-tiff.c (tiff_image_parse): Don't leak pixbuf on error.

	* io-gif.c (gdk_pixbuf__gif_image_load_increment): Don't leak
	context->buf on error.

	* gdk-pixbuf-loader.c (gdk_pixbuf_loader_close): Make sure to call
	stop_load even for short images to prevent memleaks.
This commit is contained in:
Matthias Clasen
2002-03-25 23:22:01 +00:00
parent 94168cf845
commit de19229a33
4 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gdk-pixbuf/ChangeLog
View File

@ -1,3 +1,13 @@
2002-03-26 Matthias Clasen <maclas@gmx.de>
* io-tiff.c (tiff_image_parse): Don't leak pixbuf on error.
* io-gif.c (gdk_pixbuf__gif_image_load_increment): Don't leak
context->buf on error.
* gdk-pixbuf-loader.c (gdk_pixbuf_loader_close): Make sure to call
stop_load even for short images to prevent memleaks.
2002-03-25 Matthias Clasen <maclas@gmx.de> 2002-03-25 Matthias Clasen <maclas@gmx.de>
* io-png.c (setup_png_transformations): Changed signature to * io-png.c (setup_png_transformations): Changed signature to

6
gdk-pixbuf/gdk-pixbuf-loader.c
View File

@ -536,8 +536,10 @@ gdk_pixbuf_loader_close (GdkPixbufLoader *loader,
retval = FALSE; retval = FALSE;
} }
} }
if (retval && priv->image_module && priv->image_module->stop_load && priv->context) if (priv->image_module && priv->image_module->stop_load && priv->context) {
retval = priv->image_module->stop_load (priv->context, error); if (!priv->image_module->stop_load (priv->context, error))
retval = FALSE;
}
priv->closed = TRUE; priv->closed = TRUE;

1
gdk-pixbuf/io-gif.c
View File

@ -1485,6 +1485,7 @@ gdk_pixbuf__gif_image_load_increment (gpointer data,
retval = gif_main_loop (context); retval = gif_main_loop (context);
if (retval == -2) { if (retval == -2) {
if (context->buf == buf)
context->buf = NULL; context->buf = NULL;
return FALSE; return FALSE;
} }

3
gdk-pixbuf/io-tiff.c
View File

@ -192,6 +192,8 @@ tiff_image_parse (TIFF *tiff, TiffContext *context, GError **error)
GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR,
GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY, GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
_("Insufficient memory to open TIFF file")); _("Insufficient memory to open TIFF file"));
g_object_unref (pixbuf);
return NULL; return NULL;
} }
@ -199,6 +201,7 @@ tiff_image_parse (TIFF *tiff, TiffContext *context, GError **error)
tiff_set_error (error, tiff_set_error (error,
GDK_PIXBUF_ERROR_FAILED, GDK_PIXBUF_ERROR_FAILED,
_("Failed to load RGB data from TIFF file")); _("Failed to load RGB data from TIFF file"));
g_object_unref (pixbuf);
_TIFFfree (rast); _TIFFfree (rast);
return NULL; return NULL;