diff options
author | svenbarth <svenbarth@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2018-09-08 14:56:09 +0000 |
---|---|---|
committer | svenbarth <svenbarth@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2018-09-08 14:56:09 +0000 |
commit | 66717be10f85d8fa7638740136482b12f2a27a61 (patch) | |
tree | 54936a560bc5a6f2c00914a1cd7a5bbe090f7c0f /packages/rtl-extra | |
parent | f9995ec24eebf2a1559ee12aba9c6d2f69c87620 (diff) | |
download | fpc-66717be10f85d8fa7638740136482b12f2a27a61.tar.gz |
* fix for Mantis #34239: the parent VMT is an indirect reference due to the changes for dynamic packages for quite some time already, so handle that accordingly
+ added test
git-svn-id: https://svn.freepascal.org/svn/fpc/trunk@39715 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'packages/rtl-extra')
-rw-r--r-- | packages/rtl-extra/src/inc/objects.pp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/packages/rtl-extra/src/inc/objects.pp b/packages/rtl-extra/src/inc/objects.pp index 5044de24db..7a21de7315 100644 --- a/packages/rtl-extra/src/inc/objects.pp +++ b/packages/rtl-extra/src/inc/objects.pp @@ -1014,7 +1014,7 @@ TYPE PPVMT=^PVMT; VMT=RECORD Size,NegSize:Longint; - ParentLink:PVMT; + ParentLink:PPVMT; END; VAR SP:PPVMT; Q:PVMT; BEGIN @@ -1026,7 +1026,10 @@ BEGIN Is_Object:=True; Break; End; - Q:=Q^.Parentlink; + IF Q^.Parentlink<>Nil THEN + Q:=Q^.Parentlink^ + ELSE + Q:=Nil; End; END; |