From e029f8f45b6d3f1a468d5e8d476e99c01fffdada Mon Sep 17 00:00:00 2001
From: David Carlier <devnexen@gmail.com>
Date: Thu, 25 Sep 2025 19:49:38 +0100
Subject: [PATCH] Fix GH-19955: imagefttext() memory leak

close GH-19968
---
 NEWS                      |  3 +++
 ext/gd/libgd/gdkanji.c    |  2 ++
 ext/gd/tests/gh19955.phpt | 15 +++++++++++++++
 3 files changed, 20 insertions(+)
 create mode 100644 ext/gd/tests/gh19955.phpt

diff --git a/NEWS b/NEWS
index a7f5149c5e2..58d9ebc69ad 100644
--- a/NEWS
+++ b/NEWS
@@ -27,6 +27,9 @@ PHP                                                                        NEWS
 - DBA:
   . Fixed GH-19885 (dba_fetch() overflow on skip argument). (David Carlier)
 
+- GD:
+  . FIxed GH-19955 (imagefttext() memory leak). (David Carlier)
+
 - SimpleXML:
   . Fixed bug GH-19988 (zend_string_init with NULL pointer in simplexml (UB)).
     (nielsdos)
diff --git a/ext/gd/libgd/gdkanji.c b/ext/gd/libgd/gdkanji.c
index 21bc2280982..ef769f89bad 100644
--- a/ext/gd/libgd/gdkanji.c
+++ b/ext/gd/libgd/gdkanji.c
@@ -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;
     }
 
diff --git a/ext/gd/tests/gh19955.phpt b/ext/gd/tests/gh19955.phpt
new file mode 100644
index 00000000000..a4b58e403cf
--- /dev/null
+++ b/ext/gd/tests/gh19955.phpt
@@ -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