From 072699d38a93bde1aabb5c4f5b07cad30f8491b6 Mon Sep 17 00:00:00 2001
From: svenbarth <pascaldragon@googlemail.com>
Date: Fri, 31 Aug 2018 19:16:45 +0000
Subject: [PATCH] * protect the destructors of tabstractrecordsymtable and
 twithsymtable against executing when called with a refcount > 1 (this fixes
 Mantis #34210) + added simplified test

git-svn-id: trunk@39693 -
---
 .gitattributes        |  1 +
 compiler/symtable.pas |  7 +++++--
 tests/tbs/tb0650.pp   | 21 +++++++++++++++++++++
 3 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 tests/tbs/tb0650.pp

diff --git a/.gitattributes b/.gitattributes
index 7b4f9bbdac..8d641cf4be 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -11596,6 +11596,7 @@ tests/tbs/tb0646a.pp svneol=native#text/pascal
 tests/tbs/tb0646b.pp svneol=native#text/pascal
 tests/tbs/tb0648.pp svneol=native#text/pascal
 tests/tbs/tb0649.pp -text svneol=native#text/pascal
+tests/tbs/tb0650.pp svneol=native#text/pascal
 tests/tbs/tb205.pp svneol=native#text/plain
 tests/tbs/tb610.pp svneol=native#text/pascal
 tests/tbs/tb613.pp svneol=native#text/plain
diff --git a/compiler/symtable.pas b/compiler/symtable.pas
index 4edf783048..bfe86f3fb7 100644
--- a/compiler/symtable.pas
+++ b/compiler/symtable.pas
@@ -1179,9 +1179,10 @@ implementation
         mopofs : pmanagementoperator_offset_entry;
         i : longint;
       begin
+        if refcount>1 then
+          exit;
 {$ifdef llvm}
-        if refcount=1 then
-          fllvmst.free;
+        fllvmst.free;
 {$endif llvm}
         for mop in tmanagementoperator do
           begin
@@ -2713,6 +2714,8 @@ implementation
 
     destructor twithsymtable.destroy;
       begin
+        if refcount>1 then
+          exit;
         withrefnode.free;
         { Disable SymList because we don't Own it }
         SymList:=nil;
diff --git a/tests/tbs/tb0650.pp b/tests/tbs/tb0650.pp
new file mode 100644
index 0000000000..be1bca8cff
--- /dev/null
+++ b/tests/tbs/tb0650.pp
@@ -0,0 +1,21 @@
+unit tb0650;
+
+{$mode objfpc}{$H+}
+
+interface
+
+type
+  TTest = record
+    SomeField: String;
+  end;
+
+  TTestType = type TTest;
+
+  TTestClass = class
+    fField: TTestType;
+  end;
+
+implementation
+
+end.
+