paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-15 08:29:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

rtl: don't perform string conversion if source string is in CP_NONE encoding (rawbytestring)

Browse Source 
git-svn-id: trunk@19420 -
This commit is contained in:
paul 2011-10-08 17:56:43 +00:00
parent 7013237317
commit 1c41680c58
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rtl/inc/astrings.inc
View File

@ -402,6 +402,7 @@ Function fpc_AnsiStr_To_AnsiStr (const S : RawByteString;cp : TSystemCodePage):
Var Var
Size : SizeInt; Size : SizeInt;
temp : UnicodeString; temp : UnicodeString;
orgcp: TSystemCodePage;
begin begin
result:=''; result:='';
Size:=Length(S); Size:=Length(S);
@ -409,7 +410,8 @@ begin
begin begin
if (cp=0) or (cp=CP_NONE) then if (cp=0) or (cp=CP_NONE) then
cp:=DefaultSystemCodePage; cp:=DefaultSystemCodePage;
if (StringCodePage(S)=cp) then orgcp:=StringCodePage(S);
if (orgcp=cp) or (orgcp=CP_NONE) then
begin begin
SetLength(result,Size); SetLength(result,Size);
Move(S[1],result[1],Size); Move(S[1],result[1],Size);