archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.3'

Browse source 
* PHP-8.3:
  Follow-up fix for GH-13082
This commit is contained in:
Niels Dossche 2024-01-13 18:02:43 +01:00
commit a3a318682a
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ext/gd/gd.c
View file

@ -2745,9 +2745,8 @@ static void php_imagechar(INTERNAL_FUNCTION_PARAMETERS, int mode)
gdImagePtr im; gdImagePtr im;
int ch = 0, col, x, y, i, l = 0; int ch = 0, col, x, y, i, l = 0;
unsigned char *str = NULL; unsigned char *str = NULL;
zend_object *font_obj; zend_object *font_obj = NULL;
zend_long font_int = 0; zend_long font_int = 0;
gdFontPtr font = NULL;
ZEND_PARSE_PARAMETERS_START(6, 6) ZEND_PARSE_PARAMETERS_START(6, 6)
Z_PARAM_OBJECT_OF_CLASS(IM, gd_image_ce) Z_PARAM_OBJECT_OF_CLASS(IM, gd_image_ce)
@ -2772,7 +2771,7 @@ static void php_imagechar(INTERNAL_FUNCTION_PARAMETERS, int mode)
y = Y; y = Y;
x = X; x = X;
font = php_find_gd_font(font_obj, font_int); gdFontPtr font = php_find_gd_font(font_obj, font_int);
switch (mode) { switch (mode) {
case 0: case 0: