fix the fix for bug #70976 (imagerotate)

diff --git a/ext/gd/libgd/gd_interpolation.c b/ext/gd/libgd/gd_interpolation.c
index 2f5df4892772ee244678781ee364406358066b6a..24fc3ce529dea8ef950c59f4e20cde172d15b1ea 100644 (file)
--- a/ext/gd/libgd/gd_interpolation.c
+++ b/ext/gd/libgd/gd_interpolation.c
@@ -2162,7 +2162,7 @@ gdImagePtr gdImageRotateInterpolated(const gdImagePtr src, const float angle, in
 {
        const int angle_rounded = (int)floor(angle * 100);
 
-       if (bgcolor < 0 || (!src->trueColor && bgcolor >= gdMaxColors)) {
+       if (bgcolor < 0) {
                return NULL;
        }
 
@@ -2170,7 +2170,7 @@ gdImagePtr gdImageRotateInterpolated(const gdImagePtr src, const float angle, in
           images can be done at a later point.
        */
        if (src->trueColor == 0) {
-               if (bgcolor >= 0) {
+               if (bgcolor < gdMaxColors) {
                        bgcolor =  gdTrueColorAlpha(src->red[bgcolor], src->green[bgcolor], src->blue[bgcolor], src->alpha[bgcolor]);
                }
                gdImagePaletteToTrueColor(src);

diff --git a/ext/gd/tests/bug70976.phpt b/ext/gd/tests/bug70976.phpt
index 23af4eedc741f724d68f6bc1888555953b3d0f1a..dfbd4b49ec942b39680e7205bb543fc47f942e43 100644 (file)
--- a/ext/gd/tests/bug70976.phpt
+++ b/ext/gd/tests/bug70976.phpt
@@ -6,8 +6,8 @@ Bug #70976 (Memory Read via gdImageRotateInterpolated Array Index Out of Bounds)
 ?>
 --FILE--
 <?php
-$img = imagerotate(imagecreate(1,1),45,0x7ffffff9);
+$img = imagerotate(imagecreate(10,10),45,0x7ffffff9);
 var_dump($img);
 ?>
 --EXPECTF--
-bool(false)
\ No newline at end of file
+resource(5) of type (gd)
\ No newline at end of file