paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-16 17:19:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

* unified the out of memory check in FloodFill and perform proper cleanup, so no memory leaks arise

Browse Source 
git-svn-id: trunk@40974 -
This commit is contained in:
nickysn 2019-01-21 16:22:11 +00:00
parent b654c34d64
commit 6bb104a16d
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
packages/graph/src/inc/fills.inc
View File

@ -437,13 +437,6 @@ var
Begin
If (x<0) Or (y<0) Or
(x>ViewWidth) Or (y>ViewHeight) then Exit;
GetMem(DrawnList,sizeof(PFloodLine)*((ViewHeight div YResDiv) + 1));
if not assigned(DrawnList) then
begin
_GraphResult := grNoFloodMem;
exit;
end;
FillChar(DrawnList^,sizeof(PFloodLine)*((ViewHeight div YResDiv) + 1),0);
{ MaxX is based on zero index }
{$ifdef FPC_GRAPH_SUPPORTS_TRUECOLOR}
if MaxColor > 65536 then
@ -451,14 +444,28 @@ var
else
{$endif FPC_GRAPH_SUPPORTS_TRUECOLOR}
SBufferSize := (ViewWidth+1)*2; { A pixel color is represented by a word }
DrawnList:=nil;
s1:=nil;
s2:=nil;
s3:=nil;
GetMem(DrawnList,sizeof(PFloodLine)*((ViewHeight div YResDiv) + 1));
GetMem (s1,SBufferSize);
GetMem (s2,SBufferSize);
GetMem (s3,SBufferSize);
if (not assigned(s1)) or (not assigned(s2)) or (not assigned(s3)) then
if (not assigned(DrawnList)) or (not assigned(s1)) or (not assigned(s2)) or (not assigned(s3)) then
begin
_GraphResult := grNoFloodMem;
if assigned(s1) then
System.FreeMem (s1,SBufferSize);
if assigned(s2) then
System.FreeMem (s2,SBufferSize);
if assigned(s3) then
System.FreeMem (s3,SBufferSize);
if assigned(DrawnList) then
System.FreeMem(DrawnList,sizeof(PFloodLine)*((ViewHeight div YResDiv) + 1));
exit;
end;
FillChar(DrawnList^,sizeof(PFloodLine)*((ViewHeight div YResDiv) + 1),0);
{ init prevy }
prevy := 32767;
{ Save current drawing color }