paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-10 05:16:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Codetools: Check for nil SrcTree in TUnitDictionary.ParseUnit. Can happen with invalid code.

Browse Source 
git-svn-id: trunk@37667 -
This commit is contained in:
juha 2012-06-16 18:35:34 +00:00
parent 7093e49073
commit 2028f4a305
1 changed files with 55 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
components/codetools/unitdictionary.pas
View File

@ -1087,8 +1087,7 @@ begin
IncreaseChangeStamp;
end;
function TUnitDictionary.ParseUnit(UnitFilename: string; Group: TUDUnitGroup
): TUDUnit;
function TUnitDictionary.ParseUnit(UnitFilename: string; Group: TUDUnitGroup): TUDUnit;
var
Code: TCodeBuffer;
begin
@ -1101,8 +1100,7 @@ begin
Result:=ParseUnit(Code,Group);
end;
function TUnitDictionary.ParseUnit(Code: TCodeBuffer; Group: TUDUnitGroup
): TUDUnit;
function TUnitDictionary.ParseUnit(Code: TCodeBuffer; Group: TUDUnitGroup): TUDUnit;
begin
Result:=nil;
if Code=nil then exit;
@ -1111,8 +1109,7 @@ begin
Result:=ParseUnit(CodeToolBoss.CurCodeTool,Group);
end;
function TUnitDictionary.ParseUnit(Tool: TCodeTool; Group: TUDUnitGroup
): TUDUnit;
function TUnitDictionary.ParseUnit(Tool: TCodeTool; Group: TUDUnitGroup): TUDUnit;
var
SrcTree: TAVLTree;
AVLNode: TAVLTreeNode;
@ -1163,6 +1160,7 @@ begin
// update list of identifiers
Changed:=false;
SrcTree:=Tool.InterfaceIdentifierCache.Items;
if SrcTree<>nil then begin
AVLNode:=SrcTree.FindLowest;
PrevItem:=nil;
CurItem:=Result.FirstIdentifier;
@ -1216,13 +1214,13 @@ begin
end;
AVLNode:=SrcTree.FindSuccessor(AVLNode);
end;
end;
if Changed then
IncreaseChangeStamp;
end;
function TUnitDictionary.FindUnitWithFilename(const aFilename: string
): TUDUnit;
function TUnitDictionary.FindUnitWithFilename(const aFilename: string): TUDUnit;
var
AVLNode: TAVLTreeNode;
begin