From 322555c7ce1d2b23d14445856ed26b7ffc2685f5 Mon Sep 17 00:00:00 2001
From: Michael VAN CANNEYT <mvancanneyt@tixeo.com>
Date: Thu, 26 Jan 2023 11:30:00 +0100
Subject: [PATCH] * CompareStrAnsiStringProc is not necessarily assigned

---
 rtl/objpas/fpwidestring.pp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/rtl/objpas/fpwidestring.pp b/rtl/objpas/fpwidestring.pp
index c2a2555ed3..0cfb40e083 100644
--- a/rtl/objpas/fpwidestring.pp
+++ b/rtl/objpas/fpwidestring.pp
@@ -727,14 +727,14 @@ function CompareStrAnsiString(const S1, S2: ansistring): PtrInt;
 var
   l1, l2 : PtrInt;
 begin
-  if (current_Collation.DataPtr=nil) then
-    exit(OldManager.CompareStrAnsiStringProc(s1,s2));
+  if (current_Collation.DataPtr=nil) and Assigned(OldManager.CompareStrAnsiStringProc) then
+    Exit(OldManager.CompareStrAnsiStringProc(s1,s2));
   if (Pointer(S1)=Pointer(S2)) then
-    exit(0);
+    Exit(0);
   l1:=Length(S1);
   l2:=Length(S2);
   if (l1=0) or (l2=0) then
-    exit(l1-l2);
+    Exit(l1-l2);
   Result := InternalCompareStrAnsiString(@S1[1],@S2[1],l1,l2);
 end;