Merge branch 'PHP-8.3'

php · Jan 9, 2024 · b667616 · b667616
2 parents fed9cf6 + 7d238bf
commit b667616
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
@@ -2677,8 +2677,8 @@ static gdFontPtr php_find_gd_font(zend_object *font_obj, zend_long font_int)
  */
 static void php_imagefontsize(INTERNAL_FUNCTION_PARAMETERS, int arg)
 {
-	zend_object *font_obj;
-	zend_long font_int;
+	zend_object *font_obj = NULL;
+	zend_long font_int = 0;
 	gdFontPtr font;
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
@@ -2746,8 +2746,8 @@ static void php_imagechar(INTERNAL_FUNCTION_PARAMETERS, int mode)
 	int ch = 0, col, x, y, i, l = 0;
 	unsigned char *str = NULL;
 	zend_object *font_obj;
-	zend_long font_int;
-	gdFontPtr font;
+	zend_long font_int = 0;
+	gdFontPtr font = NULL;
 
 	ZEND_PARSE_PARAMETERS_START(6, 6)
 		Z_PARAM_OBJECT_OF_CLASS(IM, gd_image_ce)

diff --git a/ext/gd/tests/gh13082.gdf b/ext/gd/tests/gh13082.gdf
diff --git a/ext/gd/tests/gh13082.phpt b/ext/gd/tests/gh13082.phpt
@@ -0,0 +1,16 @@
+--TEST--
+GH-13082 - imagefontwidth/height unexpectedly throwing an exception on a valid GdFont object.
+--EXTENSIONS--
+gd
+--FILE--
+<?php
+    $font = imageloadfont(__DIR__ . "/gh13082.gdf");
+    if ($font === false) die("imageloadfont failed");
+    if (!($font instanceof GdFont)) die("invalid gd font");
+
+    var_dump(imagefontwidth($font));
+    var_dump(imagefontheight($font));
+?>
+--EXPECT--
+int(12)
+int(20)