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

Fix potential NULL pointer dereference in gdImageClone()

master
Fábio Cabral Pacheco 2019-12-20 12:03:33 -03:00 committed by Christoph M. Becker
parent 2e886046f8
commit a93eac0e84
5 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gd.c
View File

@ -2865,14 +2865,6 @@ BGD_DECLARE(gdImagePtr) gdImageClone (gdImagePtr src) {
}
}
if (src->styleLength > 0) {
dst->styleLength = src->styleLength;
dst->stylePos = src->stylePos;
for (i = 0; i < src->styleLength; i++) {
dst->style[i] = src->style[i];
}
}
dst->interlace = src->interlace;
dst->alphaBlendingFlag = src->alphaBlendingFlag;
@ -2907,6 +2899,7 @@ BGD_DECLARE(gdImagePtr) gdImageClone (gdImagePtr src) {
if (src->style) {
gdImageSetStyle(dst, src->style, src->styleLength);
dst->stylePos = src->stylePos;
}
for (i = 0; i < gdMaxColors; i++) {

1
tests/gdimageclone/.gitignore vendored
View File

@ -1 +1,2 @@
/bug00300
/style

1
tests/gdimageclone/CMakeLists.txt
View File

@ -1,5 +1,6 @@
LIST(APPEND TESTS_FILES
bug00300
style
)
ADD_GD_TESTS()

3
tests/gdimageclone/Makemodule.am
View File

@ -1,5 +1,6 @@
libgd_test_programs += \
gdimageclone/bug00300
gdimageclone/bug00300 \
gdimageclone/style
EXTRA_DIST += \
gdimageclone/CMakeLists.txt

30
tests/gdimageclone/style.c Normal file
View File

@ -0,0 +1,30 @@
/**
* Cloning an image should exactly reproduce all style related data
*/
#include <string.h>
#include "gd.h"
#include "gdtest.h"
int main()
{
gdImagePtr im, clone;
int style[] = {0, 0, 0};
im = gdImageCreate(8, 8);
gdImageSetStyle(im, style, sizeof(style)/sizeof(style[0]));
clone = gdImageClone(im);
gdTestAssert(clone != NULL);
gdTestAssert(clone->styleLength == im->styleLength);
gdTestAssert(clone->stylePos == im->stylePos);
gdTestAssert(!memcmp(clone->style, im->style, sizeof(style)/sizeof(style[0])));
gdImageDestroy(clone);
gdImageDestroy(im);
return gdNumFailures();
}