Skip to content

Commit da769be

Browse files
thg2knielsdos
authored andcommitted
Fix parameter numbers for imagecolorset()
This is the 8.2 & 8.3 version of GH-14477.
1 parent 473cbdf commit da769be

File tree

3 files changed

+32
-3
lines changed

3 files changed

+32
-3
lines changed

NEWS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ PHP NEWS
1818
- DOM:
1919
. Fixed bug GH-14343 (Memory leak in xml and dom). (nielsdos)
2020

21+
- GD:
22+
. Fix parameter numbers for imagecolorset(). (Giovanni Giacobbi)
23+
2124
- Intl:
2225
. Fix reference handling in SpoofChecker. (nielsdos)
2326

ext/gd/gd.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2216,9 +2216,9 @@ PHP_FUNCTION(imagecolorset)
22162216

22172217
im = php_gd_libgdimageptr_from_zval_p(IM);
22182218

2219-
CHECK_RGBA_RANGE(red, Red, 2);
2220-
CHECK_RGBA_RANGE(green, Green, 3);
2221-
CHECK_RGBA_RANGE(blue, Blue, 4);
2219+
CHECK_RGBA_RANGE(red, Red, 3);
2220+
CHECK_RGBA_RANGE(green, Green, 4);
2221+
CHECK_RGBA_RANGE(blue, Blue, 5);
22222222

22232223
col = color;
22242224

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
--TEST--
2+
imagecolorset() parameters errors
3+
--EXTENSIONS--
4+
gd
5+
--FILE--
6+
<?php
7+
8+
require __DIR__ . '/func.inc';
9+
10+
$im = imagecreate(5, 5);
11+
12+
$c = imagecolorallocatealpha($im, 3, 4, 5, 6);
13+
14+
trycatch_dump(
15+
fn() => imagecolorset($im, $c, -3, 4, 5, 6),
16+
fn() => imagecolorset($im, $c, 3, -4, 5, 6),
17+
fn() => imagecolorset($im, $c, 3, 4, -5, 6),
18+
fn() => imagecolorset($im, $c, 3, 4, 5, -6),
19+
);
20+
21+
?>
22+
--EXPECT--
23+
!! [ValueError] imagecolorset(): Argument #3 ($red) must be between 0 and 255 (inclusive)
24+
!! [ValueError] imagecolorset(): Argument #4 ($green) must be between 0 and 255 (inclusive)
25+
!! [ValueError] imagecolorset(): Argument #5 ($blue) must be between 0 and 255 (inclusive)
26+
NULL

0 commit comments

Comments
 (0)