mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-27 15:52:00 -08:00
Code Issues Projects Releases Wiki Activity

(pbm_load): Allow color values up to 65535.

Browse source 
Throw an error if max_color_idx is outside the supported range.
Report an error when image size is invalid.
Read two bytes at a time when raw images have max_color_idx above 255.
This commit is contained in:
Jason Rumney 2008-03-28 14:59:22 +00:00
parent 3ae8f8760f
commit b9c89e11fb
2 changed files with 38 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/ChangeLog
View file

@ -1,3 +1,10 @@
2008-03-28 Jason Rumney <jasonr@gnu.org>
* image.c (pbm_load): Allow color values up to 65535.
Throw an error if max_color_idx is outside the supported range.
Report an error when image size is invalid.
Read two bytes at a time when raw images have max_color_idx above 255.
2008-03-26 Alexandre Oliva <aoliva@redhat.com> (tiny change)
* regex.c (EXTEND_BUFFER): Change order of pointer addition

42
src/image.c
View file

@ -5776,13 +5776,18 @@ pbm_load (f, img)
if (type != PBM_MONO)
{
max_color_idx = pbm_scan_number (&p, end);
if (raw_p && max_color_idx > 255)
max_color_idx = 255;
if (max_color_idx > 65535 || max_color_idx < 0)
{
image_error ("Unsupported maximum PBM color value", Qnil, Qnil);
goto error;
}
}
if (!check_image_size (f, width, height)
|| (type != PBM_MONO && max_color_idx < 0))
goto error;
if (!check_image_size (f, width, height))
{
image_error ("Invalid image size", Qnil, Qnil);
goto error;
}
if (!x_create_x_image_and_pixmap (f, width, height, 0,
&ximg, &img->pixmap))
@ -5842,10 +5847,13 @@ pbm_load (f, img)
}
else
{
if (raw_p
&& ((type == PBM_GRAY)
? (p + height * width > end)
: (p + 3 * height * width > end)))
int expected_size = height * width;
if (max_color_idx > 255)
expected_size *= 2;
if (type == PBM_COLOR)
expected_size *= 3;
if (raw_p && p + expected_size > end)
{
x_destroy_x_image (ximg);
x_clear_image (f, img);
@ -5859,13 +5867,25 @@ pbm_load (f, img)
{
int r, g, b;
if (type == PBM_GRAY)
r = g = b = raw_p ? *p++ : pbm_scan_number (&p, end);
if (type == PBM_GRAY && raw_p)
{
r = g = b = *p++;
if (max_color_idx > 255)
r = g = b = r * 256 + *p++;
}
else if (type == PBM_GRAY)
r = g = b = pbm_scan_number (&p, end);
else if (raw_p)
{
r = *p++;
if (max_color_idx > 255)
r = r * 256 + *p++;
g = *p++;
if (max_color_idx > 255)
g = g * 256 + *p++;
b = *p++;
if (max_color_idx > 255)
b = b * 256 + *p++;
}
else
{