From 756f2194940c9bc1d99a97e6f6c0239c76b72338 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Van=20Canneyt?= <michael@freepascal.org>
Date: Sun, 19 Jun 2022 16:53:58 +0200
Subject: [PATCH] * Fix from Bart for unregistering out of range families. Fix
 issue 39791

(cherry picked from commit a4d8d2c2108fb83b489d2fa0ab03177c11b6395c)
---
 packages/rtl-objpas/src/inc/convutil.inc | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/rtl-objpas/src/inc/convutil.inc b/packages/rtl-objpas/src/inc/convutil.inc
index 4ca5406eac..43490b6742 100644
--- a/packages/rtl-objpas/src/inc/convutil.inc
+++ b/packages/rtl-objpas/src/inc/convutil.inc
@@ -487,11 +487,14 @@ var
 
 begin
   //Apparently this procedure is not supposed to raise exceptions
-  TheFamilies[AFamily].Deleted:=True;
-  for i:=0 to Length(TheUnits)-1 do
+  if AFamily<Length(TheFamilies) then
   begin
-    if TheUnits[i].Fam=AFamily then
-      TheUnits[i].Deleted:=True;
+    TheFamilies[AFamily].Deleted:=True;
+    for i:=0 to Length(TheUnits)-1 do
+    begin
+      if TheUnits[i].Fam=AFamily then
+        TheUnits[i].Deleted:=True;
+    end;
   end;
 end;