paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-20 16:09:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

* 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.

Browse Source 
(Before r20209, SetLength was preserving code page when the string was resized in place and had refcount=1)

git-svn-id: trunk@20214 -
This commit is contained in:
sergei 2012-02-01 21:08:13 +00:00
parent 2b60a95896
commit c862aec17c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtl/unix/cwstring.pp
View File

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