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

Debugger: Fixes for "Add option to limit converter invocations."

Browse Source
This commit is contained in:
Martin 2022-07-03 12:11:41 +02:00
parent 271024d8d9
commit fd64dddf42
2 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
components/lazdebuggers/lazdebuggerfp/fpdebuggerresultdata.pas
View File

@ -26,9 +26,11 @@ type
FLevelZeroArrayConv: TFpDbgValueConverter; // All itens in array have same type / optimize and keep converter
FInArray: Boolean;
FMaxTotalConv, FMaxArrayConv, FCurMaxArrayConv: Integer;
FNoConvert: Boolean;
function GetValConv(AnFpValue: TFpValue): TFpDbgValueConverter; inline;
procedure SetMaxArrayConv(AValue: Integer);
procedure SetMaxTotalConv(AValue: Integer);
public
destructor Destroy; override;
@ -39,7 +41,7 @@ type
property Debugger: TFpDebugDebuggerBase read FDebugger write FDebugger;
property ExpressionScope: TFpDbgSymbolScope read FExpressionScope write FExpressionScope;
property MaxArrayConv: Integer read FMaxArrayConv write SetMaxArrayConv;
property MaxTotalConv: Integer read FMaxTotalConv write FMaxTotalConv;
property MaxTotalConv: Integer read FMaxTotalConv write SetMaxTotalConv;
end;
implementation
@ -52,6 +54,11 @@ var
i: Integer;
begin
Result := nil;
if (FNoConvert) or
(FInArray and (FMaxArrayConv <= 0))
then
exit;
if (ValConfig <> nil) then begin
if ValConfig.CheckMatch(AnFpValue) then
Result := ValConfig.Converter;
@ -81,6 +88,13 @@ begin
FCurMaxArrayConv := AValue;
end;
procedure TFpLazDbgWatchResultConvertor.SetMaxTotalConv(AValue: Integer);
begin
if FMaxTotalConv = AValue then Exit;
FMaxTotalConv := AValue;
FNoConvert := FMaxTotalConv <= 0;
end;
destructor TFpLazDbgWatchResultConvertor.Destroy;
begin
inherited Destroy;
@ -143,23 +157,26 @@ begin
else
dec(FCurMaxArrayConv);
end;
end;
if (CurConv <> nil) then begin
AnResData.CreateStructure(dstInternal);
AnResFld := AnResData.AddField('', dfvUnknown, []);
if (CurConv <> nil) then begin
NewFpVal := CurConv.ConvertValue(AnFpValue, Debugger, ExpressionScope);
if NewFpVal <> nil then begin
Result := inherited DoValueToResData(NewFpVal, AnResFld);
NewFpVal := CurConv.ConvertValue(AnFpValue, Debugger, ExpressionScope);
if NewFpVal <> nil then begin
Result := inherited DoValueToResData(NewFpVal, AnResFld);
end
else begin
if IsError(CurConv.LastErrror) then
AnResFld.CreateError(ErrorHandler.ErrorAsString(CurConv.LastErrror))
else
AnResFld.CreateError('Conversion failed');
Result := True;
end;
end
else begin
if IsError(CurConv.LastErrror) then
AnResFld.CreateError(ErrorHandler.ErrorAsString(CurConv.LastErrror))
else
AnResFld.CreateError('Conversion failed');
Result := True;
end;
else
AnResFld.CreateError('');
AnResData := AnResData.AddField('', dfvUnknown, []);
end;
finally

4
ide/packages/idedebugger/idedebuggerwatchresprinter.pas
View File

@ -159,6 +159,10 @@ begin
if (AResValue.FieldCount > 1) then begin
Result := PrintWatchValueEx(AResValue.Fields[1].Field, ADispFormat, ANestLvl);
if (AResValue.Fields[0].Field = nil) or
(AResValue.Fields[0].Field.ValueKind <> rdkError) or
(AResValue.Fields[0].Field.AsString <> '')
then
Result := Result + ' { '
+ PrintWatchValueEx(AResValue.Fields[0].Field, ADispFormat, ANestLvl)
+ ' }';