1 |
|
2 |
# HG changeset patch |
3 |
# User Bob Friesenhahn <bfriesen@GraphicsMagick.org> |
4 |
# Date 1501555785 18000 |
5 |
# Node ID 95d00d55e978dec3e1bb4c288dbc210b5cc8bea1 |
6 |
# Parent 921a31d31ea85405b54771941e195782e50e589d |
7 |
SUN: Fix heap read overflow while indexing colormap in bilevel decoder |
8 |
|
9 |
--- a/coders/sun.c Mon Jul 31 09:35:26 2017 -0400 |
10 |
+++ b/coders/sun.c Mon Jul 31 21:49:45 2017 -0500 |
11 |
@@ -1,5 +1,5 @@ |
12 |
/* |
13 |
-% Copyright (C) 2003-2015 GraphicsMagick Group |
14 |
+% Copyright (C) 2003-2017 GraphicsMagick Group |
15 |
% Copyright (C) 2002 ImageMagick Studio |
16 |
% Copyright 1991-1999 E. I. du Pont de Nemours and Company |
17 |
% |
18 |
@@ -577,6 +577,7 @@ |
19 |
for (bit=7; bit >= 0; bit--) |
20 |
{ |
21 |
index=((*p) & (0x01 << bit) ? 0x01 : 0x00); |
22 |
+ VerifyColormapIndex(image,index); |
23 |
indexes[x+7-bit]=index; |
24 |
q[x+7-bit]=image->colormap[index]; |
25 |
} |
26 |
@@ -587,6 +588,7 @@ |
27 |
for (bit=7; bit >= (long) (8-(image->columns % 8)); bit--) |
28 |
{ |
29 |
index=((*p) & (0x01 << bit) ? 0x01 : 0x00); |
30 |
+ VerifyColormapIndex(image,index); |
31 |
indexes[x+7-bit]=index; |
32 |
q[x+7-bit]=image->colormap[index]; |
33 |
} |