author | Michael Nestler <Michael.Nestler@Oracle.COM> |
Fri, 25 Mar 2016 06:09:30 -0700 | |
changeset 5658 | b4ad53d98db3 |
permissions | -rw-r--r-- |
5658
b4ad53d98db3
22642764 problem in UTILITY/PHP
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
1 |
# Source: upstream |
b4ad53d98db3
22642764 problem in UTILITY/PHP
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
2 |
# see: https://bugs.php.net/bug.php?id=70976 |
b4ad53d98db3
22642764 problem in UTILITY/PHP
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
3 |
# this fix (adapted): |
b4ad53d98db3
22642764 problem in UTILITY/PHP
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
4 |
# https://github.com/php/php-src/commit/2baeb167a08b0186a885208bdc8b5871f1681dc8.diff |
b4ad53d98db3
22642764 problem in UTILITY/PHP
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
5 |
|
b4ad53d98db3
22642764 problem in UTILITY/PHP
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
6 |
diff --git a/ext/gd/libgd/gd_interpolation.c b/ext/gd/libgd/gd_interpolation.c |
b4ad53d98db3
22642764 problem in UTILITY/PHP
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
7 |
--- a/ext/gd/libgd/gd_interpolation.c |
b4ad53d98db3
22642764 problem in UTILITY/PHP
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
8 |
+++ b/ext/gd/libgd/gd_interpolation.c |
b4ad53d98db3
22642764 problem in UTILITY/PHP
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
9 |
@@ -2154,7 +2154,7 @@ gdImagePtr gdImageRotateInterpolated(const gdImagePtr src, const float angle, in |
b4ad53d98db3
22642764 problem in UTILITY/PHP
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
10 |
{ |
b4ad53d98db3
22642764 problem in UTILITY/PHP
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
11 |
const int angle_rounded = (int)floor(angle * 100); |
b4ad53d98db3
22642764 problem in UTILITY/PHP
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
12 |
|
b4ad53d98db3
22642764 problem in UTILITY/PHP
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
13 |
- if (bgcolor < 0) { |
b4ad53d98db3
22642764 problem in UTILITY/PHP
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
14 |
+ if (bgcolor < 0 || (!src->trueColor && bgcolor >= gdMaxColors)) { |
b4ad53d98db3
22642764 problem in UTILITY/PHP
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
15 |
return NULL; |
b4ad53d98db3
22642764 problem in UTILITY/PHP
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
16 |
} |
b4ad53d98db3
22642764 problem in UTILITY/PHP
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
17 |
|
b4ad53d98db3
22642764 problem in UTILITY/PHP
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
18 |