paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-05 04:18:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

* IN case of IO error, MD5File will return an empty digest. Fixes issue #41194

Browse Source
This commit is contained in:
Michaël Van Canneyt 2025-03-16 19:14:55 +01:00
parent bf510fbd62
commit 2256593e92
1 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
packages/hash/src/md5.pp
View File

@ -630,17 +630,20 @@ begin
Reset(F, 1);
{$pop}
if IOResult = 0 then
begin
GetMem(Buf, BufSize);
repeat
BlockRead(F, Buf^, Bufsize, Count);
if Count > 0 then
MDUpdate(Context, Buf^, Count);
until Count < BufSize;
FreeMem(Buf, BufSize);
Close(F);
end;
if IOResult <> 0 then
begin
Result:=Default(TMDDigest);
Exit;
end;
GetMem(Buf, BufSize);
repeat
BlockRead(F, Buf^, Bufsize, Count);
if Count > 0 then
MDUpdate(Context, Buf^, Count);
until Count < BufSize;
FreeMem(Buf, BufSize);
Close(F);
MDFinal(Context, Result);
FileMode := ofm;
@ -663,17 +666,19 @@ begin
Reset(F, 1);
{$pop}
if IOResult = 0 then
begin
GetMem(Buf, BufSize);
repeat
BlockRead(F, Buf^, Bufsize, Count);
if Count > 0 then
MDUpdate(Context, Buf^, Count);
until Count < BufSize;
FreeMem(Buf, BufSize);
Close(F);
end;
if IOResult <> 0 then
begin
Result:=Default(TMDDigest);
Exit;
end;
GetMem(Buf, BufSize);
repeat
BlockRead(F, Buf^, Bufsize, Count);
if Count > 0 then
MDUpdate(Context, Buf^, Count);
until Count < BufSize;
FreeMem(Buf, BufSize);
Close(F);
MDFinal(Context, Result);
FileMode := ofm;