Просмотр исходного кода

* Optimization by Bart. Fixes issue #40150

Michaël Van Canneyt 1 месяц назад
Родитель
Сommit
3c7d0cbe27
1 измененных файлов с 2 добавлено и 2 удалено
  1. 2 2
      rtl/objpas/sysutils/sysstr.inc

+ 2 - 2
rtl/objpas/sysutils/sysstr.inc

@@ -292,7 +292,7 @@ end;
 function SameText(const s1,s2:String):Boolean; overload;{$ifdef SYSUTILSINLINE}inline;{$endif}
 function SameText(const s1,s2:String):Boolean; overload;{$ifdef SYSUTILSINLINE}inline;{$endif}
 
 
 begin
 begin
- Result:=CompareText(S1,S2)=0;
+ Result:=(Length(s1)=Length(s2)) and (CompareText(S1,S2)=0);
 end;
 end;
 
 
 function SameText(const s1,s2:String; LocaleOptions: TLocaleOptions):Boolean; overload;{$ifdef SYSUTILSINLINE}inline;{$endif}
 function SameText(const s1,s2:String; LocaleOptions: TLocaleOptions):Boolean; overload;{$ifdef SYSUTILSINLINE}inline;{$endif}
@@ -307,7 +307,7 @@ end;
 function SameStr(const s1,s2:String):Boolean; overload;{$ifdef SYSUTILSINLINE}inline;{$endif}
 function SameStr(const s1,s2:String):Boolean; overload;{$ifdef SYSUTILSINLINE}inline;{$endif}
 
 
 begin
 begin
- Result:=CompareStr(S1,S2)=0;
+ Result:=(Length(s1)=Length(s2)) and (CompareStr(S1,S2)=0);
 end;
 end;
 
 
 function SameStr(const s1,s2:String; LocaleOptions: TLocaleOptions):Boolean; overload;{$ifdef SYSUTILSINLINE}inline;{$endif}
 function SameStr(const s1,s2:String; LocaleOptions: TLocaleOptions):Boolean; overload;{$ifdef SYSUTILSINLINE}inline;{$endif}