소스 검색

* Fix for ConvUtils.CompatibleConversionTypes by Bart, resolves bug #39775

marcoonthegit 3 년 전
부모
커밋
330b0b1157
1개의 변경된 파일3개의 추가작업 그리고 1개의 파일을 삭제
  1. 3 1
      packages/rtl-objpas/src/inc/convutil.inc

+ 3 - 1
packages/rtl-objpas/src/inc/convutil.inc

@@ -333,7 +333,9 @@ end;
 function CompatibleConversionTypes(const AFrom, ATo: TConvType): Boolean;
 function CompatibleConversionTypes(const AFrom, ATo: TConvType): Boolean;
 
 
 begin
 begin
-  result:=ConvTypeToFamily(AFrom)=ConvTypeToFamily(ATo);
+ //ConvTypeToFamily returns TConvFamily(0) if the TConvType is not registerd, but 0 is a valid value for a TConvFamily
+  result:= (AFrom<length(TheUnits)) and (ATo<length(TheUnits)) and
+           (ConvTypeToFamily(AFrom)=ConvTypeToFamily(ATo));
 end;
 end;
 
 
 Function RegisterConversionFamily(Const S:String):TConvFamily;
 Function RegisterConversionFamily(Const S:String):TConvFamily;