mirror of
https://github.com/php/php-src.git
synced 2026-03-24 00:02:20 +01:00
Merge branch 'PHP-8.3' into PHP-8.4
This commit is contained in:
3
NEWS
3
NEWS
@@ -32,6 +32,9 @@ PHP NEWS
|
||||
(Arnaud)
|
||||
. Fixed bug GH-19831 (function JIT may not deref property value). (Arnaud)
|
||||
|
||||
- GD:
|
||||
. FIxed GH-19955 (imagefttext() memory leak). (David Carlier)
|
||||
|
||||
- SimpleXML:
|
||||
. Fixed bug GH-19988 (zend_string_init with NULL pointer in simplexml (UB)).
|
||||
(nielsdos)
|
||||
|
||||
@@ -368,6 +368,8 @@ do_convert (unsigned char *to, unsigned char *from, const char *code)
|
||||
else
|
||||
error ("something happen");
|
||||
strcpy ((char *) to, (const char *) from);
|
||||
if (iconv_close (cd) != 0)
|
||||
error ("iconv_close() error");
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
15
ext/gd/tests/gh19955.phpt
Normal file
15
ext/gd/tests/gh19955.phpt
Normal file
@@ -0,0 +1,15 @@
|
||||
--TEST--
|
||||
GH-19955: (imagefttext() memory leak)
|
||||
--EXTENSIONS--
|
||||
gd
|
||||
--CREDITS--
|
||||
YuanchengJiang
|
||||
--FILE--
|
||||
<?php
|
||||
ini_set('error_reporting', E_ALL&~E_WARNING);
|
||||
$im = imagecreate(64, 32);
|
||||
imagefttext(imagecreate(8, 8), 0, 0, 0, 0, 255, __DIR__ . "/Tuffy.ttf", 'Ж');
|
||||
echo "OK"
|
||||
?>
|
||||
--EXPECT--
|
||||
OK
|
||||
Reference in New Issue
Block a user