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

* change IIDStr from a field to a property as otherwise the compiler would access the wrong field offset as it assumes RawUnitName to be a 255-byte ShortString

Browse Source 
git-svn-id: trunk@35026 -
This commit is contained in:
svenbarth 2016-12-01 12:59:20 +00:00
parent 4fb77b71ec
commit fde867cd5c
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rtl/objpas/typinfo.pp
View File

@ -206,6 +206,7 @@ unit typinfo;
function GetExtendedInfo: PTypeInfo; inline;
function GetIntfParent: PTypeInfo; inline;
function GetRawIntfParent: PTypeInfo; inline;
function GetIIDStr: ShortString; inline;
function GetElType: PTypeInfo; inline;
function GetElType2: PTypeInfo; inline;
function GetInstanceType: PTypeInfo; inline;
@ -224,6 +225,7 @@ unit typinfo;
property IntfParent: PTypeInfo read GetIntfParent;
{ tkInterfaceRaw }
property RawIntfParent: PTypeInfo read GetRawIntfParent;
property IIDStr: ShortString read GetIIDStr;
{ tkDynArray }
property ElType2: PTypeInfo read GetElType2;
property ElType: PTypeInfo read GetElType;
@ -314,7 +316,7 @@ unit typinfo;
RawIntfFlags : TIntfFlagsBase;
IID: TGUID;
RawIntfUnit: ShortString;
IIDStr: ShortString;
{ IIDStr: ShortString; }
{ here the properties follow as Word Count & array of TPropInfo }
);
tkArray:
@ -2317,6 +2319,11 @@ begin
Result := DerefTypeInfoPtr(RawIntfParentRef);
end;
function TTypeData.GetIIDStr: ShortString;
begin
Result := PShortString(Pointer(@RawIntfUnit) + Length(RawIntfUnit) + 1)^;
end;
function TTypeData.GetElType: PTypeInfo;
begin
Result := DerefTypeInfoPtr(elTypeRef);