瀏覽代碼

* Ensure null-terminated strings. Patch by modersohn, fixes issue #40499

Michaël Van Canneyt 1 年之前
父節點
當前提交
25c75b1784
共有 1 個文件被更改,包括 2 次插入1 次删除
  1. 2 1
      rtl/unix/cwstring.pp

+ 2 - 1
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