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

avglvltree: fix DisposeNode for nil Node. Issue #32189

Browse Source 
git-svn-id: branches/fixes_1_8@55577 -
This commit is contained in:
mattias 2017-07-24 12:26:29 +00:00
parent 26b7f76858
commit ea0ecda82c
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/lazutils/avglvltree.pas
View File

@ -401,7 +401,7 @@ end;
procedure TAvgLvlTree.DisposeNode(aNode: TAVLTreeNode);
begin
if FOwnsObjects then
if FOwnsObjects and Assigned(aNode) then
begin
TObject(aNode.Data).Free;
aNode.Data := nil;

9
components/lazutils/laz_avl_tree.pp
View File

@ -624,16 +624,15 @@ procedure TAVLTree.Clear;
procedure DeleteNode(ANode: TAVLTreeNode);
begin
if ANode<>nil then begin
if ANode.Left<>nil then DeleteNode(ANode.Left);
if ANode.Right<>nil then DeleteNode(ANode.Right);
end;
if ANode.Left<>nil then DeleteNode(ANode.Left);
if ANode.Right<>nil then DeleteNode(ANode.Right);
DisposeNode(ANode);
end;
// Clear
begin
DeleteNode(Root);
if Root<>nil then
DeleteNode(Root);
fRoot:=nil;
FCount:=0;
end;