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

don't divide by zero when loading a layer or mask with zero width or

Browse Source 
2007-07-12  Sven Neumann  <sven@gimp.org>

	* plug-ins/common/psd-load.c: don't divide by zero when loading 
a
	layer or mask with zero width or height. Fixes bug #456042.


svn path=/trunk/; revision=22915
This commit is contained in:
Sven Neumann
2007-07-12 06:31:49 +00:00
committed by Sven Neumann
parent 137d4532bd
commit 7c31e0eb69
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2007-07-12 Sven Neumann <sven@gimp.org>
* plug-ins/common/psd-load.c: don't divide by zero when loading a
layer or mask with zero width or height. Fixes bug #456042.
2007-07-11 Sven Neumann <sven@gimp.org>
* plug-ins/common/lcms.c: clarify which procedures work with RGB

6
plug-ins/common/psd-load.c
View File

@ -1053,7 +1053,7 @@ do_layer_record (FILE *fd,
g_error ("Input file has a larger layer size than GIMP can handle.");
}
if (layer->width > (G_MAXUINT / layer->height))
if (layer->height && layer->width > (G_MAXUINT / layer->height))
{
g_error ("Input file has a larger layer size than GIMP can handle.");
}
@ -1184,7 +1184,7 @@ do_layer_record (FILE *fd,
g_error ("Input file has a larger layer mask size than GIMP can handle.");
}
if (layer->lm_width > (G_MAXUINT / layer->lm_height))
if (layer->lm_height && layer->lm_width > (G_MAXUINT / layer->lm_height))
{
g_error ("Input file has a larger layer mask size than GIMP can handle.");
}
@ -3235,7 +3235,7 @@ read_whole_file (FILE *fd, const gchar *filename)
gimp_filename_to_utf8 (filename));
}
if (PSDheader.columns > (G_MAXUINT / PSDheader.rows))
if (PSDheader.rows && PSDheader.columns > (G_MAXUINT / PSDheader.rows))
{
g_error ("'%s' has a larger image size than GIMP can handle.",
gimp_filename_to_utf8 (filename));