paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-13 10:39:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge of commits 41767 and 41768 into fixes branch:

Browse Source 
------------------------------------------------------------------------
r41767 | pierre | 2019-03-22 14:26:39 +0000 (Fri, 22 Mar 2019) | 1 line

 Fix tkBool in class method TValue.Make 

------------------------------------------------------------------------
r41768 | pierre | 2019-03-22 14:27:41 +0000 (Fri, 22 Mar 2019) | 1 line

 Explicitly set values inside TestDataSize procedure to avoid range check errors as values are copied when TValue.Make is called
------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@41873 -
This commit is contained in:
pierre 2019-04-15 10:03:37 +00:00
parent 8b356ea8d7
commit aa33dfcdcc
2 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/rtl-objpas/src/inc/rtti.pp
View File

@ -1688,13 +1688,13 @@ begin
end; end;
tkBool : begin tkBool : begin
case GetTypeData(ATypeInfo)^.OrdType of case GetTypeData(ATypeInfo)^.OrdType of
otUByte: result.FData.FAsSByte := ShortInt(PBoolean(ABuffer)^); otUByte: result.FData.FAsUByte := Byte(System.PBoolean(ABuffer)^);
otUWord: result.FData.FAsUWord := Byte(PBoolean16(ABuffer)^); otUWord: result.FData.FAsUWord := Word(PBoolean16(ABuffer)^);
otULong: result.FData.FAsULong := SmallInt(PBoolean32(ABuffer)^); otULong: result.FData.FAsULong := DWord(PBoolean32(ABuffer)^);
otUQWord: result.FData.FAsUInt64 := QWord(PBoolean64(ABuffer)^); otUQWord: result.FData.FAsUInt64 := QWord(PBoolean64(ABuffer)^);
otSByte: result.FData.FAsSByte := Word(PByteBool(ABuffer)^); otSByte: result.FData.FAsSByte := ShortInt(PByteBool(ABuffer)^);
otSWord: result.FData.FAsSWord := LongInt(PWordBool(ABuffer)^); otSWord: result.FData.FAsSWord := SmallInt(PWordBool(ABuffer)^);
otSLong: result.FData.FAsSLong := LongWord(PLongBool(ABuffer)^); otSLong: result.FData.FAsSLong := LongInt(PLongBool(ABuffer)^);
otSQWord: result.FData.FAsSInt64 := Int64(PQWordBool(ABuffer)^); otSQWord: result.FData.FAsSInt64 := Int64(PQWordBool(ABuffer)^);
end; end;
end; end;

27
packages/rtl-objpas/tests/tests.rtti.pas
View File

@ -1148,61 +1148,85 @@ var
value: TValue; value: TValue;
begin begin
u8:=245;
TValue.Make(@u8, TypeInfo(UInt8), value); TValue.Make(@u8, TypeInfo(UInt8), value);
CheckEquals(1, value.DataSize, 'Size of UInt8 differs'); CheckEquals(1, value.DataSize, 'Size of UInt8 differs');
u16:=789;
TValue.Make(@u16, TypeInfo(UInt16), value); TValue.Make(@u16, TypeInfo(UInt16), value);
CheckEquals(2, value.DataSize, 'Size of UInt16 differs'); CheckEquals(2, value.DataSize, 'Size of UInt16 differs');
u32:=568789;
TValue.Make(@u32, TypeInfo(UInt32), value); TValue.Make(@u32, TypeInfo(UInt32), value);
CheckEquals(4, value.DataSize, 'Size of UInt32 differs'); CheckEquals(4, value.DataSize, 'Size of UInt32 differs');
u64:=$abdcefadbcef;
TValue.Make(@u64, TypeInfo(UInt64), value); TValue.Make(@u64, TypeInfo(UInt64), value);
CheckEquals(8, value.DataSize, 'Size of UInt64 differs'); CheckEquals(8, value.DataSize, 'Size of UInt64 differs');
s8:=-32;
TValue.Make(@s8, TypeInfo(Int8), value); TValue.Make(@s8, TypeInfo(Int8), value);
CheckEquals(1, value.DataSize, 'Size of Int8 differs'); CheckEquals(1, value.DataSize, 'Size of Int8 differs');
s16:=-5345;
TValue.Make(@s16, TypeInfo(Int16), value); TValue.Make(@s16, TypeInfo(Int16), value);
CheckEquals(2, value.DataSize, 'Size of Int16 differs'); CheckEquals(2, value.DataSize, 'Size of Int16 differs');
s32:=-234567;
TValue.Make(@s32, TypeInfo(Int32), value); TValue.Make(@s32, TypeInfo(Int32), value);
CheckEquals(4, value.DataSize, 'Size of Int32 differs'); CheckEquals(4, value.DataSize, 'Size of Int32 differs');
s64:=23456789012;
TValue.Make(@s64, TypeInfo(Int64), value); TValue.Make(@s64, TypeInfo(Int64), value);
CheckEquals(8, value.DataSize, 'Size of Int64 differs'); CheckEquals(8, value.DataSize, 'Size of Int64 differs');
b8:=false;
TValue.Make(@b8, TypeInfo(Boolean), value); TValue.Make(@b8, TypeInfo(Boolean), value);
CheckEquals(1, value.DataSize, 'Size of Boolean differs'); CheckEquals(1, value.DataSize, 'Size of Boolean differs');
{$ifdef fpc} {$ifdef fpc}
b16:=true;
TValue.Make(@b16, TypeInfo(Boolean16), value); TValue.Make(@b16, TypeInfo(Boolean16), value);
CheckEquals(2, value.DataSize, 'Size of Boolean16 differs'); CheckEquals(2, value.DataSize, 'Size of Boolean16 differs');
b32:=false;
TValue.Make(@b32, TypeInfo(Boolean32), value); TValue.Make(@b32, TypeInfo(Boolean32), value);
CheckEquals(4, value.DataSize, 'Size of Boolean32 differs'); CheckEquals(4, value.DataSize, 'Size of Boolean32 differs');
b64:=true;
TValue.Make(@b64, TypeInfo(Boolean64), value); TValue.Make(@b64, TypeInfo(Boolean64), value);
CheckEquals(8, value.DataSize, 'Size of Boolean64 differs'); CheckEquals(8, value.DataSize, 'Size of Boolean64 differs');
{$endif} {$endif}
bl8:=true;
TValue.Make(@bl8, TypeInfo(ByteBool), value); TValue.Make(@bl8, TypeInfo(ByteBool), value);
CheckEquals(1, value.DataSize, 'Size of ByteBool differs'); CheckEquals(1, value.DataSize, 'Size of ByteBool differs');
bl16:=false;
TValue.Make(@bl16, TypeInfo(WordBool), value); TValue.Make(@bl16, TypeInfo(WordBool), value);
CheckEquals(2, value.DataSize, 'Size of WordBool differs'); CheckEquals(2, value.DataSize, 'Size of WordBool differs');
bl32:=false;
TValue.Make(@bl32, TypeInfo(LongBool), value); TValue.Make(@bl32, TypeInfo(LongBool), value);
CheckEquals(4, value.DataSize, 'Size of LongBool differs'); CheckEquals(4, value.DataSize, 'Size of LongBool differs');
{$ifdef fpc} {$ifdef fpc}
bl64:=true;
TValue.Make(@bl64, TypeInfo(QWordBool), value); TValue.Make(@bl64, TypeInfo(QWordBool), value);
CheckEquals(8, value.DataSize, 'Size of QWordBool differs'); CheckEquals(8, value.DataSize, 'Size of QWordBool differs');
{$endif} {$endif}
f32:=4.567;
TValue.Make(@f32, TypeInfo(Single), value); TValue.Make(@f32, TypeInfo(Single), value);
CheckEquals(4, value.DataSize, 'Size of Single differs'); CheckEquals(4, value.DataSize, 'Size of Single differs');
f64:=-3456.678;
TValue.Make(@f64, TypeInfo(Double), value); TValue.Make(@f64, TypeInfo(Double), value);
CheckEquals(8, value.DataSize, 'Size of Double differs'); CheckEquals(8, value.DataSize, 'Size of Double differs');
{$ifdef FPC_HAS_TYPE_EXTENDED} {$ifdef FPC_HAS_TYPE_EXTENDED}
f80:=-2345.678;
TValue.Make(@f80, TypeInfo(Extended), value); TValue.Make(@f80, TypeInfo(Extended), value);
CheckEquals(10, value.DataSize, 'Size of Extended differs'); CheckEquals(10, value.DataSize, 'Size of Extended differs');
{$endif} {$endif}
fcu:=56.78;
TValue.Make(@fcu, TypeInfo(Currency), value); TValue.Make(@fcu, TypeInfo(Currency), value);
CheckEquals(SizeOf(Currency), value.DataSize, 'Size of Currency differs'); CheckEquals(SizeOf(Currency), value.DataSize, 'Size of Currency differs');
fco:=456;
TValue.Make(@fco, TypeInfo(Comp), value); TValue.Make(@fco, TypeInfo(Comp), value);
CheckEquals(SizeOf(Comp), value.DataSize, 'Size of Comp differs'); CheckEquals(SizeOf(Comp), value.DataSize, 'Size of Comp differs');
ss := ''; ss := '';
TValue.Make(@ss, TypeInfo(ShortString), value); TValue.Make(@ss, TypeInfo(ShortString), value);
CheckEquals(254, value.DataSize, 'Size ofShortString differs'); CheckEquals(254, value.DataSize, 'Size ofShortString differs');
sa:= '';
TValue.Make(@sa, TypeInfo(AnsiString), value); TValue.Make(@sa, TypeInfo(AnsiString), value);
CheckEquals(SizeOf(Pointer), value.DataSize, 'Size of AnsiString differs'); CheckEquals(SizeOf(Pointer), value.DataSize, 'Size of AnsiString differs');
sw := '';
TValue.Make(@sw, TypeInfo(WideString), value); TValue.Make(@sw, TypeInfo(WideString), value);
CheckEquals(SizeOf(Pointer), value.DataSize, 'Size of WideString differs'); CheckEquals(SizeOf(Pointer), value.DataSize, 'Size of WideString differs');
su:='';
TValue.Make(@su, TypeInfo(UnicodeString), value); TValue.Make(@su, TypeInfo(UnicodeString), value);
CheckEquals(SizeOf(Pointer), value.DataSize, 'Size of UnicodeString differs'); CheckEquals(SizeOf(Pointer), value.DataSize, 'Size of UnicodeString differs');
o := TTestValueClass.Create; o := TTestValueClass.Create;
@ -1212,6 +1236,7 @@ begin
c := TObject; c := TObject;
TValue.Make(@c, TypeInfo(TClass), value); TValue.Make(@c, TypeInfo(TClass), value);
CheckEquals(SizeOf(Pointer), value.DataSize, 'Size of TClass differs'); CheckEquals(SizeOf(Pointer), value.DataSize, 'Size of TClass differs');
i := Nil;
TValue.Make(@i, TypeInfo(IInterface), value); TValue.Make(@i, TypeInfo(IInterface), value);
CheckEquals(SizeOf(Pointer), value.DataSize, 'Size of IInterface differs'); CheckEquals(SizeOf(Pointer), value.DataSize, 'Size of IInterface differs');
TValue.Make(@t, TypeInfo(TTestRecord), value); TValue.Make(@t, TypeInfo(TTestRecord), value);
@ -1226,8 +1251,10 @@ begin
CheckEquals(SizeOf(TArrayOfLongintStatic), value.DataSize, 'Size of TArrayOfLongintStatic differs'); CheckEquals(SizeOf(TArrayOfLongintStatic), value.DataSize, 'Size of TArrayOfLongintStatic differs');
TValue.Make(@ad, TypeInfo(TArrayOfLongintDyn), value); TValue.Make(@ad, TypeInfo(TArrayOfLongintDyn), value);
CheckEquals(SizeOf(TArrayOfLongintDyn), value.DataSize, 'Size of TArrayOfLongintDyn differs'); CheckEquals(SizeOf(TArrayOfLongintDyn), value.DataSize, 'Size of TArrayOfLongintDyn differs');
e:=low(TTestEnum);
TValue.Make(@e, TypeInfo(TTestEnum), value); TValue.Make(@e, TypeInfo(TTestEnum), value);
CheckEquals(SizeOf(TTestEnum), value.DataSize, 'Size of TTestEnum differs'); CheckEquals(SizeOf(TTestEnum), value.DataSize, 'Size of TTestEnum differs');
s:=[low(TTestEnum),high(TTestEnum)];
TValue.Make(@s, TypeInfo(TTestSet), value); TValue.Make(@s, TypeInfo(TTestSet), value);
CheckEquals(SizeOf(TTestSet), value.DataSize, 'Size of TTestSet differs'); CheckEquals(SizeOf(TTestSet), value.DataSize, 'Size of TTestSet differs');
p := Nil; p := Nil;