From 25c75b1784d0a0d37337c15810fc7fe462a96bbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Van=20Canneyt?= <michael@freepascal.org>
Date: Fri, 3 Nov 2023 17:01:03 +0100
Subject: [PATCH] * Ensure null-terminated strings. Patch by modersohn, fixes
 issue #40499

---
 rtl/unix/cwstring.pp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rtl/unix/cwstring.pp b/rtl/unix/cwstring.pp
index 99fe19248f..900787bc80 100644
--- a/rtl/unix/cwstring.pp
+++ b/rtl/unix/cwstring.pp
@@ -285,7 +285,8 @@ begin
 {$endif}
   toencoding:=iconvname;
   if not assigned(iconvctl) then
-    toencoding:=toencoding+TransLitName;
+    toencoding:=toencoding+TransLitName+#0;
+  iconvname:=iconvname+#0;
   iconv_wide2ansi:=iconv_open(PAnsiChar(@toencoding[1]),unicode_encoding2);
   iconv_ansi2wide:=iconv_open(unicode_encoding2,PAnsiChar(@iconvname[1]));
   if assigned(iconvctl) and