1
0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00

Merge branch 'PHP-8.2' into PHP-8.3

This commit is contained in:
David Carlier
2024-01-09 22:01:15 +00:00
4 changed files with 24 additions and 4 deletions

4
NEWS
View File

@@ -40,6 +40,10 @@ PHP NEWS
(Jakub Zelenka)
. Fixed bug GH-12905 (FFI::new interacts badly with observers). (nielsdos)
- GD:
. Fixed GH-13082 undefined behavior with GdFont instances handling with
imageload* and imagechar*. (David Carlier)
- Intl:
. Fixed GH-12943 (IntlDateFormatter::__construct accepts 'C' as valid locale).
(David Carlier)

View File

@@ -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)

BIN
ext/gd/tests/gh13082.gdf Normal file

Binary file not shown.

16
ext/gd/tests/gh13082.phpt Normal file
View File

@@ -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)