diff options
| author | Pierre Joye <pierre.php@gmail.com> | 2013-04-09 10:04:32 +0200 |
|---|---|---|
| committer | Pierre Joye <pierre.php@gmail.com> | 2013-04-09 10:04:32 +0200 |
| commit | 4d6c367177e58b238de67133edff6f14c0a2343b (patch) | |
| tree | 229427e0473f9c94bdbdf55964fab02eea3f8729 | |
| parent | 83500123d02789781c25691527ae720ba1587948 (diff) | |
| parent | 10d62de4aadd83638967ff86dcb2f94688f8dece (diff) | |
| download | php-git-4d6c367177e58b238de67133edff6f14c0a2343b.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
# By Pierre Joye (1) and Rasmus Lerdorf (1)
* PHP-5.4:
fix null deref
Fixed bugs #47675 and #64577 (fd leak on Solaris)
| -rw-r--r-- | ext/gd/libgd/gd_rotate.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/gd/libgd/gd_rotate.c b/ext/gd/libgd/gd_rotate.c index 430d51d963..e9a393d943 100644 --- a/ext/gd/libgd/gd_rotate.c +++ b/ext/gd/libgd/gd_rotate.c @@ -262,12 +262,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++) { |