summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Joye <pierre.php@gmail.com>2013-04-09 10:09:17 +0200
committerPierre Joye <pierre.php@gmail.com>2013-04-09 10:09:17 +0200
commit88b3cdc4e9ec199044dd9b2d82d12639226091dd (patch)
treee1b0f29001343ab0e672907d26a6d9844871c105
parent4d4adf47e0a31f56e7c2ecf777895de3d70b05ea (diff)
downloadphp-git-88b3cdc4e9ec199044dd9b2d82d12639226091dd.tar.gz
fix possible NULL deref
-rw-r--r--ext/gd/libgd/gd_rotate.c6
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++) {