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

guard against a possible stack overflow.

Browse Source 
2007-04-27  Sven Neumann  <sven@gimp.org>

	* plug-ins/common/sunras.c (set_color_table): guard against a
	possible stack overflow.

svn path=/trunk/; revision=22355
This commit is contained in:
Sven Neumann 2007-04-27 11:50:00 +00:00 committed by Sven Neumann
parent e3fb63d568
commit 00ef80ea49
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
plug-ins/common/sunras.c
View File

@ -101,8 +101,7 @@ static gint save_image (const gchar *filename,
gint32 image_ID, gint32 image_ID,
gint32 drawable_ID); gint32 drawable_ID);
static void set_color_table (gint32, L_SUNFILEHEADER *, unsigned char *); static void set_color_table (gint32, L_SUNFILEHEADER *, const guchar *);
static gint32 create_new_image (const gchar *filename, static gint32 create_new_image (const gchar *filename,
guint width, guint width,
guint height, guint height,
@ -857,19 +856,20 @@ write_sun_cols (FILE *ofp,
static void static void
set_color_table (gint32 image_ID, set_color_table (gint32 image_ID,
L_SUNFILEHEADER *sunhdr, L_SUNFILEHEADER *sunhdr,
guchar *suncolmap) const guchar *suncolmap)
{ {
int ncols, j; guchar ColorMap[256 * 3];
guchar ColorMap[256*3]; gint ncols, j;
ncols = sunhdr->l_ras_maplength / 3; ncols = sunhdr->l_ras_maplength / 3;
if (ncols <= 0) return; if (ncols <= 0)
return;
for (j = 0; j < ncols; j++) for (j = 0; j < MIN (ncols, 256); j++)
{ {
ColorMap[j*3] = suncolmap[j]; ColorMap[j * 3 + 0] = suncolmap[j];
ColorMap[j*3+1] = suncolmap[j+ncols]; ColorMap[j * 3 + 1] = suncolmap[j + ncols];
ColorMap[j*3+2] = suncolmap[j+2*ncols]; ColorMap[j * 3 + 2] = suncolmap[j + 2 * ncols];
} }
#ifdef DEBUG #ifdef DEBUG
@ -878,6 +878,7 @@ set_color_table (gint32 image_ID,
printf ("%3d: 0x%02x 0x%02x 0x%02x\n", j, printf ("%3d: 0x%02x 0x%02x 0x%02x\n", j,
ColorMap[j*3], ColorMap[j*3+1], ColorMap[j*3+2]); ColorMap[j*3], ColorMap[j*3+1], ColorMap[j*3+2]);
#endif #endif
gimp_image_set_colormap (image_ID, ColorMap, ncols); gimp_image_set_colormap (image_ID, ColorMap, ncols);
} }