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

* use dynamic arrays instead of getmem for resource strings

Browse Source
This commit is contained in:
Michaël Van Canneyt 2025-03-18 10:50:11 +01:00
parent 1547f28a40
commit ef5c0a4ba8
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
compiler/cresstr.pas
View File

@ -44,7 +44,7 @@ uses
TResourceStringItem = class(TLinkedListItem)
Sym : TConstSym;
Name : String;
AValue : PAnsiChar;
AValue : TAnsiCharDynArray;
WValue : pcompilerwidestring; // just a reference, do not free.
Len : Longint; // in bytes, not characters
hash : Cardinal;
@ -92,8 +92,8 @@ uses
else
begin
Len:=asym.value.len;
GetMem(AValue,Len);
Move(asym.value.valueptr^,AValue^,Len);
SetLength(AValue,Len);
Move(asym.value.valueptr^,AValue[0],Len);
end;
CalcHash;
end;
@ -101,8 +101,7 @@ uses
destructor TResourceStringItem.Destroy;
begin
if Assigned(AValue) then
FreeMem(AValue);
AValue:=nil;
end;
@ -209,7 +208,7 @@ uses
else
begin
if assigned(R.AValue) then
valuelab:=tcb.emit_ansistring_const(current_asmdata.asmlists[al_const],R.AValue,R.Len,getansistringcodepage)
valuelab:=tcb.emit_ansistring_const(current_asmdata.asmlists[al_const],PAnsiChar(R.AValue),R.Len,getansistringcodepage)
end;
end;
current_asmdata.asmlists[al_const].concat(cai_align.Create(sizeof(pint)));
@ -293,7 +292,7 @@ uses
if Not r.isUnicode then
begin
initwidestring(W);
ascii2unicode(R.AValue,R.Len,current_settings.sourcecodepage,W);
ascii2unicode(PAnsiChar(R.AValue),R.Len,current_settings.sourcecodepage,W);
end
else
begin