diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2013-04-09 12:10:54 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2013-04-09 12:10:54 +0400 |
| commit | e13d2c7c7f7decdd55726dff9994dc62494e6150 (patch) | |
| tree | d3975f036badc1832ee749248292fa63c8bc0fa0 | |
| parent | 4bf1f3801b26a6c491a5deaeafef0b0b6d175a09 (diff) | |
| parent | 24f1045d55fa4d3df357b76cf6e35a1407267cf1 (diff) | |
| download | php-git-e13d2c7c7f7decdd55726dff9994dc62494e6150.tar.gz | |
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src:
fix possible NULL deref
fix null deref
Fixed bugs #47675 and #64577 (fd leak on Solaris)
| -rw-r--r-- | ext/gd/libgd/gd_rotate.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/ext/gd/libgd/gd_rotate.c b/ext/gd/libgd/gd_rotate.c index 430d51d963..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++) { @@ -262,12 +263,13 @@ gdImagePtr gdImageRotate180 (gdImagePtr src, int ignoretransparent) f = gdImageGetPixel; } dst = gdImageCreateTrueColor(src->sx, src->sy); - 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++) { @@ -309,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++) { |