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

Merge branch 'PHP-8.5'

This commit is contained in:
David Carlier
2025-09-29 23:21:18 +01:00
2 changed files with 17 additions and 0 deletions

View File

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