paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-05-14 22:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

SynEdit: Fix crash in FoldNodeInfoList, due to Pas-HL hack attempting to alter fold info for "class of". Issue #32940

Browse Source 
git-svn-id: trunk@57066 -
This commit is contained in:
martin 2018-01-12 23:41:02 +00:00
parent 61e0c2a1ff
commit c99d4b6ff6
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/synedit/synedithighlighterfoldbase.pas
View File

@ -1188,6 +1188,10 @@ begin
FFoldNodeInfoList.GroupFilter := FFoldGroup;
c := FFoldNodeInfoList.Count - 1;
//debugln(['TLazSynEditNestedFoldsList.InitNestInfoForIndex CurLine=',CurLine, ' c=',c, ' EvalIdx=',EvalIdx]);
(* if c < 0 then it is possible that a highlighter called
CodeFoldRange.Pop(false); // avoid minlevel // << still triggers min level for sfbIncludeDisabled;
without generating foldnode info // maybe the HL tries to silently change the fold type
*)
assert(c >= 0, 'InitNestInfoForIndex: FFoldNodeInfoList.Count');
for i := c downto 0 do begin

24
components/synedit/synhighlighterpas.pp
View File

@ -96,7 +96,8 @@ type
rsAfterClassField, // after ";" of a field (static needs highlight)
rsVarTypeInSpecification, // between ":"/"=" and ";" in a var or type section (or class members)
// var a: Integer; type b = Int64;
rsInTypeBlock
rsInTypeBlock,
rsSkipAllPasBlocks // used for: class of ... ;
);
TRangeStates = set of TRangeState;
@ -510,7 +511,7 @@ type
function StartPascalCodeFoldBlock
(ABlockType: TPascalCodeFoldBlockType; ForceDisabled: Boolean = False
): TSynCustomCodeFoldBlock;
procedure EndPascalCodeFoldBlock(NoMarkup: Boolean = False);
procedure EndPascalCodeFoldBlock(NoMarkup: Boolean = False; UndoInvalidOpen: Boolean = False);
procedure CloseBeginEndBlocksBeforeProc;
procedure SmartCloseBeginEndBlocks(SearchFor: TPascalCodeFoldBlockType);
procedure EndPascalCodeFoldBlockLastLine;
@ -957,8 +958,9 @@ begin
(PasCodeFoldRange.BracketNestLevel = 0)
then begin
// Accidental start of block // End at next semicolon (usually same line)
CodeFoldRange.Pop(false); // avoid minlevel
CodeFoldRange.Add(Pointer(PtrInt(cfbtUses)), false);
fRange := fRange + [rsSkipAllPasBlocks];
//CodeFoldRange.Pop(false); // avoid minlevel // does not work, still minlevel for disabled
//CodeFoldRange.Add(Pointer(PtrInt(cfbtUses)), false);
end
else
if (TopPascalCodeFoldBlockType = cfbtCase) then begin
@ -3010,16 +3012,19 @@ end;
procedure TSynPasSyn.SemicolonProc;
var
tfb: TPascalCodeFoldBlockType;
InSkipBlocks: Boolean;
begin
fTokenID := tkSymbol;
tfb := TopPascalCodeFoldBlockType;
InSkipBlocks := rsSkipAllPasBlocks in fRange;
Exclude(fRange, rsSkipAllPasBlocks);
fStringLen := 1;
if tfb = cfbtUses then
EndPascalCodeFoldBlock;
if (tfb = cfbtClass) and (rsAfterClass in fRange) then
EndPascalCodeFoldBlock(True);
if (tfb = cfbtClass) and ((rsAfterClass in fRange) or InSkipBlocks) then
EndPascalCodeFoldBlock(True, True);
while (tfb in [cfbtIfThen,cfbtIfElse,cfbtForDo,cfbtWhileDo,cfbtWithDo]) do begin
EndPascalCodeFoldBlock(True);
@ -3878,6 +3883,7 @@ var
act: TSynFoldActions;
nd: TSynFoldNodeInfo;
begin
if rsSkipAllPasBlocks in fRange then exit(nil);
BlockEnabled := FFoldConfig[ord(ABlockType)].Enabled;
if (not BlockEnabled) and (not ForceDisabled) and
(not FFoldConfig[ord(ABlockType)].IsEssential)
@ -3901,13 +3907,15 @@ begin
Result:=TSynCustomCodeFoldBlock(StartCodeFoldBlock(p+Pointer(PtrInt(ABlockType)), FoldBlock, True));
end;
procedure TSynPasSyn.EndPascalCodeFoldBlock(NoMarkup: Boolean = False);
procedure TSynPasSyn.EndPascalCodeFoldBlock(NoMarkup: Boolean;
UndoInvalidOpen: Boolean);
var
DecreaseLevel, BlockEnabled: Boolean;
act: TSynFoldActions;
BlockType: TPascalCodeFoldBlockType;
nd: TSynFoldNodeInfo;
begin
Exclude(fRange, rsSkipAllPasBlocks);
BlockType := TopPascalCodeFoldBlockType;
if BlockType in [cfbtVarType, cfbtLocalVarType] then
fRange := fRange - [rsInTypeBlock];
@ -3923,6 +3931,8 @@ begin
act := act - [sfaFold, sfaFoldFold, sfaFoldHide];
if NoMarkup then
exclude(act, sfaMarkup);
if UndoInvalidOpen then
act := act - [sfaMarkup, sfaFold, sfaOutline];
DoInitNode(nd{%H-}, True, Pointer(PtrUInt(BlockType)), act, DecreaseLevel);
CollectingNodeInfoList.Add(nd);
end;