libgd
/
libgd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#23, Added sanity checks for possible allocation failures in 

gdImageFilledPolygon and gdImageSetStyle
#24,  Out of range checks in gdImageSetAAPixelColor
master
pajoye 2007-01-03 20:45:58 +00:00
parent 677d728dbb
commit 30a36c242c
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ISSUES
View File

@ -44,3 +44,6 @@ GDBUGS NEWS
#20, Fixed gdImageCopyMergeGray when used with a true color image
#21, gdImageCopyResized sanity check for allocation failures
#22, Fixed transparency preservation in gdImageCopyRotated
#23, Added sanity checks for possible allocation failures in
gdImageFilledPolygon and gdImageSetStyle
#24, Out of range checks in gdImageSetAAPixelColor

14
src/gd.c
View File

@ -2819,6 +2819,9 @@ BGD_DECLARE(void) gdImageFilledPolygon (gdImagePtr im, gdPointPtr p, int n, int
return;
}
im->polyInts = (int *) gdMalloc (sizeof (int) * n);
if (!im->polyInts) {
return;
}
im->polyAllocated = n;
}
if (im->polyAllocated < n)
@ -2832,6 +2835,9 @@ BGD_DECLARE(void) gdImageFilledPolygon (gdImagePtr im, gdPointPtr p, int n, int
}
im->polyInts = (int *) gdRealloc (im->polyInts,
sizeof (int) * im->polyAllocated);
if (!im->polyInts) {
return;
}
}
miny = p[0].y;
maxy = p[0].y;
@ -2986,6 +2992,9 @@ BGD_DECLARE(void) gdImageSetStyle (gdImagePtr im, int *style, int noOfPixels)
return;
}
im->style = (int *) gdMalloc (sizeof (int) * noOfPixels);
if (!im->style) {
return;
}
memcpy (im->style, style, sizeof (int) * noOfPixels);
im->styleLength = noOfPixels;
im->stylePos = 0;
@ -3262,6 +3271,11 @@ nc = (cc) + (((((c) - (cc)) * (a)) + ((((c) - (cc)) * (a)) >> 8) + 0x80) >> 8);
static void gdImageSetAAPixelColor(gdImagePtr im, int x, int y, int color, int t)
{
int dr,dg,db,p,r,g,b;
/* 2.0.34: watch out for out of range calls */
if (!gdImageBoundsSafeMacro(im, x, y)) {
return;
}
p = gdImageGetPixel(im,x,y);
/* TBB: we have to implement the dont_blend stuff to provide
the full feature set of the old implementation */