forks
/
dexed
mirror of https://gitlab.com/basile.b/dexed.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix possible endless loop if invalid operator met

This commit is contained in:
Basile Burg 2014-08-27 03:37:01 +02:00
parent bd7231a67f
commit 902d979e1a
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/ce_d2syn.pas
View File

@ -127,7 +127,6 @@ type
protected protected
function GetRangeClass: TSynCustomHighlighterRangeClass; override; function GetRangeClass: TSynCustomHighlighterRangeClass; override;
published published
// Defines which kind of range can be folded, among curly brackets, block comments and nested comments
property FoldKinds: TFoldKinds read fFoldKinds write setFoldKinds; property FoldKinds: TFoldKinds read fFoldKinds write setFoldKinds;
property WhiteAttrib: TSynHighlighterAttributes read fWhiteAttrib write setWhiteAttrib; property WhiteAttrib: TSynHighlighterAttributes read fWhiteAttrib write setWhiteAttrib;
property NumbrAttrib: TSynHighlighterAttributes read fNumbrAttrib write setNumbrAttrib; property NumbrAttrib: TSynHighlighterAttributes read fNumbrAttrib write setNumbrAttrib;
@ -725,24 +724,20 @@ begin
4:begin 4:begin
if (not isOperator1(reader^)) and if (not isOperator1(reader^)) and
isOperator4(fLineBuf[fTokStart..fTokStop-1]) isOperator4(fLineBuf[fTokStart..fTokStop-1])
then exit then exit;
else Dec(fTokStop, 4);
end; end;
3:begin 3:begin
if (not isOperator1(reader^)) and if (not isOperator1(reader^)) and
isOperator3(fLineBuf[fTokStart..fTokStop-1]) isOperator3(fLineBuf[fTokStart..fTokStop-1])
then exit then exit;
else Dec(fTokStop, 3);
end; end;
2:begin 2:begin
if (not isOperator1(reader^)) and if (not isOperator1(reader^)) and
isOperator2(fLineBuf[fTokStart..fTokStop-1]) isOperator2(fLineBuf[fTokStart..fTokStop-1])
then exit then exit;
else Dec(fTokStop, 2);
end; end;
1:begin 1:begin
if not isOperator1(reader^) then exit if not isOperator1(reader^) then exit;
else Dec(fTokStop);
end; end;
end; end;
fTokKind := tkIdent; fTokKind := tkIdent;