com php-src: fix possible NULL deref: ext/gd/libgd/gd_rotate .c
| From: | Pierre Joye | Date: | Tue, 09 Apr 2013 08:09:17 +0000 |
| Subject: | com php-src: fix possible NULL deref: ext/gd/libgd/gd_rotate .c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-71894@lists.php.net to get a copy of this message | ||
Commit: 88b3cdc4e9ec199044dd9b2d82d12639226091dd
Author: Pierre Joye <pierre.php@gmail.com> Tue, 9 Apr 2013 10:09:17 +0200
Parents: 4d4adf47e0a31f56e7c2ecf777895de3d70b05ea
Branches: PHP-5.3 PHP-5.4 PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=88b3cdc4e9ec199044dd9b2d82d12639226091dd
Log:
fix possible NULL deref
Changed paths:
M ext/gd/libgd/gd_rotate.c
Diff:
diff --git a/ext/gd/libgd/gd_rotate.c b/ext/gd/libgd/gd_rotate.c
index e9a393d..e94809a 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++) {