diff options
| author | Pierre Joye <pierre.php@gmail.com> | 2016-07-19 13:44:11 +0700 |
|---|---|---|
| committer | Pierre Joye <pierre.php@gmail.com> | 2016-07-19 13:44:11 +0700 |
| commit | 6434fc9d2bc0dc497dc438f0316b9448ae6c81b6 (patch) | |
| tree | af715e3e6d1c1a17c38d5759d5903503d13a1147 /ext/gd/libgd/gd_interpolation.c | |
| parent | 88d86aeb539ef68c0772abc868b70519e7b06a2f (diff) | |
| parent | 740661bd7a4aff947acf4b7c505650eb1fd5dceb (diff) | |
| download | php-git-6434fc9d2bc0dc497dc438f0316b9448ae6c81b6.tar.gz | |
Merge branch 'PHP-7.0'
* PHP-7.0:
fix #72512, invalid read or write for palette image when invalid transparent index is used
Diffstat (limited to 'ext/gd/libgd/gd_interpolation.c')
| -rw-r--r-- | ext/gd/libgd/gd_interpolation.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ext/gd/libgd/gd_interpolation.c b/ext/gd/libgd/gd_interpolation.c index 83319966f9..fb34982582 100644 --- a/ext/gd/libgd/gd_interpolation.c +++ b/ext/gd/libgd/gd_interpolation.c @@ -1244,7 +1244,13 @@ static gdImagePtr gdImageScaleBilinearPalette(gdImagePtr im, const unsigned int if (new_img == NULL) { return NULL; } - new_img->transparent = gdTrueColorAlpha(im->red[transparent], im->green[transparent], im->blue[transparent], im->alpha[transparent]); + + if (transparent < 0) { + /* uninitialized */ + new_img->transparent = -1; + } else { + new_img->transparent = gdTrueColorAlpha(im->red[transparent], im->green[transparent], im->blue[transparent], im->alpha[transparent]); + } for (i=0; i < _height; i++) { long j; |