paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-18 15:09:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

FpDebug: fixed assert, when storing broken dyn-array (pointer to random mem). Skipped data hit assert.

Browse Source
This commit is contained in:
Martin 2023-06-06 14:04:28 +02:00
parent aad8ebec07
commit 47e0610ac8
1 changed files with 28 additions and 8 deletions

36
components/fpdebug/fpwatchresultdata.pas
View File

@ -40,6 +40,8 @@ type
procedure AddTypeNameToResData(AnFpValue: TFpValue; AnResData: IDbgWatchDataIntf; ADeref: Boolean = False);
function TypeToResData(AnFpValue: TFpValue; AnResData: IDbgWatchDataIntf): Boolean;
function PointerToResData(AnFpValue: TFpValue; AnResData: IDbgWatchDataIntf): Boolean;
function NumToResData(AnFpValue: TFpValue; AnResData: IDbgWatchDataIntf): Boolean;
@ -126,6 +128,18 @@ begin
AnResData.SetTypeName(TpName);
end;
function TFpWatchResultConvertor.TypeToResData(AnFpValue: TFpValue;
AnResData: IDbgWatchDataIntf): Boolean;
var
APrintedValue: String;
begin
if GetTypeAsDeclaration(APrintedValue, AnFpValue.DbgSymbol) then
AnResData.CreatePrePrinted('type '+APrintedValue)
else
AnResData.CreateError('Unknown type');
Result := True;
end;
function TFpWatchResultConvertor.PointerToResData(AnFpValue: TFpValue;
AnResData: IDbgWatchDataIntf): Boolean;
var
@ -842,10 +856,10 @@ begin
skClass,
skInterface: Result := StructToResData(AnFpValue, AnResData);
skNone: ;
skType: ;
skInstance: ;
skUnit: ;
//skNone: ;
//skInstance: ;
//skUnit: ;
skType: Result := TypeToResData(AnFpValue, AnResData);
skProcedure,
skFunction,
skProcedureRef,
@ -858,8 +872,12 @@ begin
skEnumValue: Result := EnumToResData(AnFpValue, AnResData);
skSet: Result := SetToResData(AnFpValue, AnResData);
skArray: Result := ArrayToResData(AnFpValue, AnResData);
skRegister: ;
skAddress: ;
//skRegister: ;
//skAddress: ;
else begin
AnResData.CreateError('Unknown data');
Result := True;
end;
end;
if Result then
CheckError(AnFpValue, AnResData)
@ -900,7 +918,7 @@ begin
if (AnFpValue.Kind = skPointer) then
FHasEmbeddedPointer := True
else
if FHasEmbeddedPointer and (FLastValueKind <> skPointer) then
if FHasEmbeddedPointer and (FLastValueKind <> skPointer) then // TODO: create a value as marker // also arrays cannot store the absence of a value
exit(True); // not an error
// Allow only one level, after an embedded pointer (pointer nested in other data-type)
end;
@ -920,8 +938,10 @@ function TFpWatchResultConvertor.DoWritePointerWatchResultData(
AnFpValue: TFpValue; AnResData: IDbgWatchDataIntf; AnAddr: TDbgPtr
): Boolean;
begin
if FRecurseAddrList.IndexOf(AnAddr) >= 0 then
if FRecurseAddrList.IndexOf(AnAddr) >= 0 then begin
AnResData.CreateError('Recursive Value at '+HexStr(AnAddr, 16)); // TOOD: correct size // TODO: dedicated entry
exit(True);
end;
if AnAddr <> 0 then
FRecurseAddrList.Add(AnAddr);
Result := DoWriteWatchResultData(AnFpValue, AnResData);