summaryrefslogtreecommitdiff
path: root/gdk-pixbuf/io-tiff.c
diff options
context:
space:
mode:
authorMatthias Clasen <matthiasc@src.gnome.org>2002-03-21 00:31:23 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2002-03-21 00:31:23 +0000
commitc4851cffcfa93e37a652d9d4c7f64132e4bdea37 (patch)
treec03d3c0ffa9f37d3f6faed8314ba6e40cc8d9bd5 /gdk-pixbuf/io-tiff.c
parent00b51fa8338d77ee99398ea1e95d368a8a1bb3c3 (diff)
downloadgdk-pixbuf-c4851cffcfa93e37a652d9d4c7f64132e4bdea37.tar.gz
Avoid a double free error if reading the colormap fails.
* io-tga.c (try_colormap, gdk_pixbuf__tga_stop_load): Avoid a double free error if reading the colormap fails. * io-tiff.c (tiff_image_parse): Make TIFFReadRGBAImage stop on errors, since it may otherwise segfault on certain bad TIFFs.
Diffstat (limited to 'gdk-pixbuf/io-tiff.c')
-rw-r--r--gdk-pixbuf/io-tiff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gdk-pixbuf/io-tiff.c b/gdk-pixbuf/io-tiff.c
index d0de10637..ff4a3dab1 100644
--- a/gdk-pixbuf/io-tiff.c
+++ b/gdk-pixbuf/io-tiff.c
@@ -195,7 +195,7 @@ tiff_image_parse (TIFF *tiff, TiffContext *context, GError **error)
return NULL;
}
- if (!TIFFReadRGBAImage (tiff, w, h, rast, 0) || global_error) {
+ if (!TIFFReadRGBAImage (tiff, w, h, rast, 1) || global_error) {
tiff_set_error (error,
GDK_PIXBUF_ERROR_FAILED,
_("Failed to load RGB data from TIFF file"));