php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.2' into PHP-8.3

Browse Source 
* PHP-8.2:
  Follow-up fix for GH-13082
This commit is contained in:
Niels Dossche
2024-01-13 18:02:25 +01:00
parent e062fe02ef df85c2556e
commit 7065fe3a88
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;
int ch = 0, col, x, y, i, l = 0;
unsigned char *str = NULL;
zend_object *font_obj;
zend_object *font_obj = NULL;
zend_long font_int = 0;
gdFontPtr font = NULL;
ZEND_PARSE_PARAMETERS_START(6, 6)
Z_PARAM_OBJECT_OF_CLASS(IM, gd_image_ce)
@@ -2772,7 +2771,7 @@ static void php_imagechar(INTERNAL_FUNCTION_PARAMETERS, int mode)
y = Y;
x = X;
font = php_find_gd_font(font_obj, font_int);
gdFontPtr font = php_find_gd_font(font_obj, font_int);
switch (mode) {
case 0: