Browse Source

rtl: don't convert strings on compare if one of them is empty

git-svn-id: trunk@19444 -
paul 14 years ago
parent
commit
908673e48b
1 changed files with 11 additions and 0 deletions
  1. 11 0
      rtl/inc/astrings.inc

+ 11 - 0
rtl/inc/astrings.inc

@@ -703,6 +703,17 @@ begin
       result:=0;
       result:=0;
       exit;
       exit;
     end;
     end;
+  { don't compare strings if one of them is empty }
+  if (pointer(S1)=nil) then
+    begin
+      result:=-Length(S2);
+      exit;
+    end;
+  if (pointer(S2)=nil) then
+    begin
+      result:=Length(S1);
+      exit;
+    end;
   cp1:=StringCodePage(S1);
   cp1:=StringCodePage(S1);
   cp2:=StringCodePage(S2);
   cp2:=StringCodePage(S2);
   if (cp1=cp2) then
   if (cp1=cp2) then