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

* fix for Mantis #31118: applied patch by Maciej Izak to fix usage of wrong variable

Browse Source 
+ added test

git-svn-id: trunk@35133 -
This commit is contained in:
svenbarth 2016-12-15 13:47:26 +00:00
parent cabcc52db1
commit 121a857af8
3 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -13007,6 +13007,7 @@ tests/test/trstr7.pp svneol=native#text/plain
tests/test/trstr8.pp svneol=native#text/plain
tests/test/trtti1.pp svneol=native#text/plain
tests/test/trtti10.pp svneol=native#text/pascal
tests/test/trtti11.pp svneol=native#text/pascal
tests/test/trtti2.pp svneol=native#text/plain
tests/test/trtti3.pp svneol=native#text/plain
tests/test/trtti4.pp svneol=native#text/plain

2
rtl/inc/rtti.inc
View File

@ -116,7 +116,7 @@ begin
{ check terminator, maybe we are already in init table }
if Assigned(PRecordInfoInit(typeInfo)^.Terminator) then
{ point to more optimal initrtti }
result:=PRecordInfoFull(result)^.InitTable;
result:=PRecordInfoFull(typeInfo)^.InitTable;
{$endif VER3_0}
end;

28
tests/test/trtti11.pp Normal file
View File

@ -0,0 +1,28 @@
program trtti11;
{$MODE DELPHI}
uses
SysUtils;
type
PFoo = ^TFoo;
TFoo = packed record
public
F: Integer;
S: string;
end;
var
PF: PFoo;
begin
try
GetMem(PF, SizeOf(TFoo));
InitializeArray(PF, TypeInfo(TFoo), 1);
PF.S := 'foo';
FinalizeArray(PF, TypeInfo(TFoo), 1);
FreeMem(PF);
except
Halt(1);
end;
end.