瀏覽代碼

* cwstring.pp, Wide2AnsiMove: moved SetCodePage to the end, so it comes after the last SetLength. Necessary after r20209, because SetLength has been modified to always set the code page of its argument. Here it sets code page of 'dest' to CP_NONE, because dest is RawByteString.
(Before r20209, SetLength was preserving code page when the string was resized in place and had refcount=1)

git-svn-id: trunk@20214 -

sergei 13 年之前
父節點
當前提交
c862aec17c
共有 1 個文件被更改,包括 1 次插入1 次删除
  1. 1 1
      rtl/unix/cwstring.pp

+ 1 - 1
rtl/unix/cwstring.pp

@@ -302,7 +302,6 @@ procedure Wide2AnsiMove(source:pwidechar; var dest:RawByteString; cp:TSystemCode
     my0:=0;
     { rought estimation }
     setlength(dest,len*3);
-    SetCodePage(dest,cp,false);
     outlength:=len*3;
     srclen:=len*2;
     srcpos:=source;
@@ -344,6 +343,7 @@ procedure Wide2AnsiMove(source:pwidechar; var dest:RawByteString; cp:TSystemCode
       end;
     // truncate string
     setlength(dest,length(dest)-outleft);
+    SetCodePage(dest,cp,false);
     if free_iconv then
       iconv_close(use_iconv);
   end;