diff options
| author | Pierre Joye <pierre.php@gmail.com> | 2013-04-09 10:09:47 +0200 |
|---|---|---|
| committer | Pierre Joye <pierre.php@gmail.com> | 2013-04-09 10:09:47 +0200 |
| commit | 24f1045d55fa4d3df357b76cf6e35a1407267cf1 (patch) | |
| tree | 1adb7ce6a96f70dab2cb076d335012a18a8240db | |
| parent | 1359eaa057b5633e9d78010b60bcb57a79130774 (diff) | |
| parent | aab56593578069bda2d50727cba15e8e19214d12 (diff) | |
| download | php-git-24f1045d55fa4d3df357b76cf6e35a1407267cf1.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix possible NULL deref
| -rw-r--r-- | ext/gd/libgd/gd_rotate.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ext/gd/libgd/gd_rotate.c b/ext/gd/libgd/gd_rotate.c index e9a393d943..e94809ae77 100644 --- a/ext/gd/libgd/gd_rotate.c +++ b/ext/gd/libgd/gd_rotate.c @@ -216,12 +216,13 @@ gdImagePtr gdImageRotate90 (gdImagePtr src, int ignoretransparent) f = gdImageGetPixel; } dst = gdImageCreateTrueColor(src->sy, src->sx); - dst->transparent = src->transparent; if (dst != NULL) { int old_blendmode = dst->alphaBlendingFlag; dst->alphaBlendingFlag = 0; + dst->transparent = src->transparent; + gdImagePaletteCopy (dst, src); for (uY = 0; uY<src->sy; uY++) { @@ -310,12 +311,13 @@ gdImagePtr gdImageRotate270 (gdImagePtr src, int ignoretransparent) f = gdImageGetPixel; } dst = gdImageCreateTrueColor (src->sy, src->sx); - dst->transparent = src->transparent; if (dst != NULL) { int old_blendmode = dst->alphaBlendingFlag; dst->alphaBlendingFlag = 0; + dst->transparent = src->transparent; + gdImagePaletteCopy (dst, src); for (uY = 0; uY<src->sy; uY++) { |