paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-20 19:09:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

* correctly handle AsString if Nil had been passed to Make

Browse Source 
git-svn-id: trunk@36983 -
This commit is contained in:
svenbarth 2017-08-20 19:19:07 +00:00
parent 31f5836e06
commit a03b9d0fc4
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -712,18 +712,18 @@ begin
end;
function TValue.AsString: string;
var
s: string;
begin
case Kind of
tkSString:
s := PShortString(FData.FValueData.GetReferenceToRawData)^;
tkAString:
s := PAnsiString(FData.FValueData.GetReferenceToRawData)^;
if (Kind in [tkSString, tkAString, tkUString, tkWString]) and not Assigned(FData.FValueData) then
Result := ''
else
raise EInvalidCast.Create(SErrInvalidTypecast);
end;
result := s;
case Kind of
tkSString:
Result := PShortString(FData.FValueData.GetReferenceToRawData)^;
tkAString:
Result := PAnsiString(FData.FValueData.GetReferenceToRawData)^;
else
raise EInvalidCast.Create(SErrInvalidTypecast);
end;
end;
function TValue.AsExtended: Extended;