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

Merge branch 'u2' into 'main'

Browse Source 
Fix UnicodeString ElementSize.

See merge request freepascal.org/fpc/source!968
This commit is contained in:
Rika 2025-04-03 00:05:26 +03:00
commit aa64fedf91
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rtl/inc/ustrings.inc
View File

@ -433,7 +433,7 @@ begin
begin
NewDestP:=GetMem((S1Len+S2Len)*sizeof(UnicodeChar)+(UnicodeFirstOff+sizeof(UnicodeChar)))+UnicodeFirstOff;
PUnicodeRec(NewDestP-UnicodeFirstOff)^.CodePage:=DefaultUnicodeCodePage;
PUnicodeRec(NewDestP-UnicodeFirstOff)^.ElementSize:=1;
PUnicodeRec(NewDestP-UnicodeFirstOff)^.ElementSize:=sizeof(UnicodeChar);
PUnicodeRec(NewDestP-UnicodeFirstOff)^.Ref:=1;
Move(Pointer(S1)^,NewDestP^,S1Len*sizeof(UnicodeChar));
Move(Pointer(S2)^,PUnicodeChar(NewDestP)[S1Len],S2Len*sizeof(UnicodeChar));
@ -489,7 +489,7 @@ begin
OldDestP:=nil; { This case is distinguished as "not assigned(olddestp)". Also prevents "if p=olddestp" in the loop below shared with the ReallocMem branch. }
NewDestP:=GetMem(NewLen*sizeof(UnicodeChar)+(UnicodeFirstOff+sizeof(UnicodeChar)))+UnicodeFirstOff;
PUnicodeRec(NewDestP-UnicodeFirstOff)^.CodePage:=DefaultUnicodeCodePage;
PUnicodeRec(NewDestP-UnicodeFirstOff)^.ElementSize:=1;
PUnicodeRec(NewDestP-UnicodeFirstOff)^.ElementSize:=sizeof(UnicodeChar);
PUnicodeRec(NewDestP-UnicodeFirstOff)^.Ref:=1;
end;
{ Copy strings from last to the first, so that possible occurences of DestS could read from the beginning of the reallocated DestS. }
@ -924,7 +924,7 @@ begin
oldsp:=sp;
sp:=GetMem(l*sizeof(UnicodeChar)+(UnicodeFirstOff+sizeof(UnicodeChar)))+UnicodeFirstOff;
PUnicodeRec(sp-UnicodeFirstOff)^.CodePage:=DefaultUnicodeCodePage;
PUnicodeRec(sp-UnicodeFirstOff)^.ElementSize:=1;
PUnicodeRec(sp-UnicodeFirstOff)^.ElementSize:=sizeof(UnicodeChar);
PUnicodeRec(sp-UnicodeFirstOff)^.Ref:=1;
if oldsp<>nil then
begin
@ -1137,7 +1137,7 @@ begin
begin
ResultAddress:=GetMem(Size*sizeof(UnicodeChar)+(UnicodeFirstOff+sizeof(UnicodeChar)))+UnicodeFirstOff;
PUnicodeRec(ResultAddress-UnicodeFirstOff)^.CodePage:=DefaultUnicodeCodePage;
PUnicodeRec(ResultAddress-UnicodeFirstOff)^.ElementSize:=1;
PUnicodeRec(ResultAddress-UnicodeFirstOff)^.ElementSize:=sizeof(UnicodeChar);
PUnicodeRec(ResultAddress-UnicodeFirstOff)^.Ref:=1;
PUnicodeRec(ResultAddress-UnicodeFirstOff)^.Len:=Size;
Move (PUnicodeChar(Pointer(S))[Index],ResultAddress^,Size*sizeof(UnicodeChar));