Skip to content
Permalink
Browse files Browse the repository at this point in the history
Sync with upstream
Even though libgd/libgd#492 is not a relevant bug fix for PHP, since
the binding doesn't use the `gdImage*Ptr()` functions at all, we're
porting the fix to stay in sync here.
  • Loading branch information
cmb69 committed Jan 19, 2019
1 parent 6aff4d0 commit 089f7c0
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 9 deletions.
20 changes: 17 additions & 3 deletions ext/gd/libgd/gd_gif_out.c
Expand Up @@ -97,12 +97,18 @@ static void cl_hash (register count_int chsize, GifCtx *ctx);
static void char_init (GifCtx *ctx);
static void char_out (int c, GifCtx *ctx);
static void flush_char (GifCtx *ctx);

static int _gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out);

void * gdImageGifPtr (gdImagePtr im, int *size)
{
void *rv;
gdIOCtx *out = gdNewDynamicCtx (2048, NULL);
gdImageGifCtx (im, out);
rv = gdDPExtractData (out, size);
if (!_gdImageGifCtx(im, out)) {
rv = gdDPExtractData(out, size);
} else {
rv = NULL;
}
out->gd_free (out);
return rv;
}
Expand All @@ -115,6 +121,12 @@ void gdImageGif (gdImagePtr im, FILE * outFile)
}

void gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out)
{
_gdImageGifCtx(im, out);
}

/* returns 0 on success, 1 on failure */
static int _gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out)
{
gdImagePtr pim = 0, tim = im;
int interlace, BitsPerPixel;
Expand All @@ -125,7 +137,7 @@ void gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out)
based temporary image. */
pim = gdImageCreatePaletteFromTrueColor(im, 1, 256);
if (!pim) {
return;
return 1;
}
tim = pim;
}
Expand All @@ -138,6 +150,8 @@ void gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out)
/* Destroy palette based temporary image. */
gdImageDestroy( pim);
}

return 0;
}

static int
Expand Down
17 changes: 14 additions & 3 deletions ext/gd/libgd/gd_jpeg.c
Expand Up @@ -132,6 +132,7 @@ const char * gdJpegGetVersionString()
}
}

static int _gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality);

/*
* Write IM to OUTFILE as a JFIF-formatted JPEG image, using quality
Expand All @@ -153,8 +154,11 @@ void *gdImageJpegPtr (gdImagePtr im, int *size, int quality)
{
void *rv;
gdIOCtx *out = gdNewDynamicCtx (2048, NULL);
gdImageJpegCtx (im, out, quality);
rv = gdDPExtractData (out, size);
if (!_gdImageJpegCtx(im, out, quality)) {
rv = gdDPExtractData(out, size);
} else {
rv = NULL;
}
out->gd_free (out);

return rv;
Expand All @@ -163,6 +167,12 @@ void *gdImageJpegPtr (gdImagePtr im, int *size, int quality)
void jpeg_gdIOCtx_dest (j_compress_ptr cinfo, gdIOCtx * outfile);

void gdImageJpegCtx (gdImagePtr im, gdIOCtx * outfile, int quality)
{
_gdImageJpegCtx(im, outfile, quality);
}

/* returns 0 on success, 1 on failure */
static int _gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality)
{
struct jpeg_compress_struct cinfo;
struct jpeg_error_mgr jerr;
Expand All @@ -184,7 +194,7 @@ void gdImageJpegCtx (gdImagePtr im, gdIOCtx * outfile, int quality)
if (row) {
gdFree (row);
}
return;
return 1;
}

cinfo.err->error_exit = fatal_jpeg_error;
Expand Down Expand Up @@ -277,6 +287,7 @@ void gdImageJpegCtx (gdImagePtr im, gdIOCtx * outfile, int quality)
jpeg_finish_compress (&cinfo);
jpeg_destroy_compress (&cinfo);
gdFree (row);
return 0;
}

gdImagePtr gdImageCreateFromJpeg (FILE * inFile)
Expand Down
18 changes: 15 additions & 3 deletions ext/gd/libgd/gd_wbmp.c
Expand Up @@ -82,6 +82,7 @@ int gd_getin (void *in)
return (gdGetC((gdIOCtx *) in));
}

static int _gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out);

/* gdImageWBMPCtx
** --------------
Expand All @@ -93,14 +94,20 @@ int gd_getin (void *in)
** out: the stream where to write
*/
void gdImageWBMPCtx (gdImagePtr image, int fg, gdIOCtx * out)
{
_gdImageWBMPCtx(image, fg, out);
}

/* returns 0 on success, 1 on failure */
static int _gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out)
{
int x, y, pos;
Wbmp *wbmp;

/* create the WBMP */
if ((wbmp = createwbmp (gdImageSX (image), gdImageSY (image), WBMP_WHITE)) == NULL) {
gd_error("Could not create WBMP");
return;
return 1;
}

/* fill up the WBMP structure */
Expand All @@ -116,7 +123,9 @@ void gdImageWBMPCtx (gdImagePtr image, int fg, gdIOCtx * out)

/* write the WBMP to a gd file descriptor */
if (writewbmp (wbmp, &gd_putout, out)) {
freewbmp(wbmp);
gd_error("Could not save WBMP");
return 1;
}
/* des submitted this bugfix: gdFree the memory. */
freewbmp(wbmp);
Expand Down Expand Up @@ -204,8 +213,11 @@ void * gdImageWBMPPtr (gdImagePtr im, int *size, int fg)
{
void *rv;
gdIOCtx *out = gdNewDynamicCtx(2048, NULL);
gdImageWBMPCtx(im, fg, out);
rv = gdDPExtractData(out, size);
if (!_gdImageWBMPCtx(im, fg, out)) {
rv = gdDPExtractData(out, size);
} else {
rv = NULL;
}
out->gd_free(out);

return rv;
Expand Down

0 comments on commit 089f7c0

Please sign in to comment.