diff options
| author | Pierre Joye <pierre.php@gmail.com> | 2013-04-09 10:09:36 +0200 |
|---|---|---|
| committer | Pierre Joye <pierre.php@gmail.com> | 2013-04-09 10:09:36 +0200 |
| commit | aab56593578069bda2d50727cba15e8e19214d12 (patch) | |
| tree | 4ec7b6433df89eb0638d7df74f3e3e8bb5c095fc | |
| parent | 10d62de4aadd83638967ff86dcb2f94688f8dece (diff) | |
| parent | 88b3cdc4e9ec199044dd9b2d82d12639226091dd (diff) | |
| download | php-git-aab56593578069bda2d50727cba15e8e19214d12.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
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++) { |