Fix a file descriptor leak in mdXhl.c (which is used by numerous hashing
algorithms. CID: 1305669,1305611,1305663,1305603,1305584,1305639,1346865,1305601 Differential Revision: https://reviews.freebsd.org/D4732 Reviewed by: allanjude, delphij MFC after: 2 weeks Sponsored by: Juniper Networks
This commit is contained in:
parent
5f0a5fefc6
commit
8d03d93fb7
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=292955
@ -59,14 +59,18 @@ MDXFileChunk(const char *filename, char *buf, off_t ofs, off_t len)
|
|||||||
f = open(filename, O_RDONLY);
|
f = open(filename, O_RDONLY);
|
||||||
if (f < 0)
|
if (f < 0)
|
||||||
return 0;
|
return 0;
|
||||||
if (fstat(f, &stbuf) < 0)
|
if (fstat(f, &stbuf) < 0) {
|
||||||
return 0;
|
i = -1;
|
||||||
|
goto error;
|
||||||
|
}
|
||||||
if (ofs > stbuf.st_size)
|
if (ofs > stbuf.st_size)
|
||||||
ofs = stbuf.st_size;
|
ofs = stbuf.st_size;
|
||||||
if ((len == 0) || (len > stbuf.st_size - ofs))
|
if ((len == 0) || (len > stbuf.st_size - ofs))
|
||||||
len = stbuf.st_size - ofs;
|
len = stbuf.st_size - ofs;
|
||||||
if (lseek(f, ofs, SEEK_SET) < 0)
|
if (lseek(f, ofs, SEEK_SET) < 0) {
|
||||||
return 0;
|
i = -1;
|
||||||
|
goto error;
|
||||||
|
}
|
||||||
n = len;
|
n = len;
|
||||||
i = 0;
|
i = 0;
|
||||||
while (n > 0) {
|
while (n > 0) {
|
||||||
@ -79,6 +83,7 @@ MDXFileChunk(const char *filename, char *buf, off_t ofs, off_t len)
|
|||||||
MDXUpdate(&ctx, buffer, i);
|
MDXUpdate(&ctx, buffer, i);
|
||||||
n -= i;
|
n -= i;
|
||||||
}
|
}
|
||||||
|
error:
|
||||||
e = errno;
|
e = errno;
|
||||||
close(f);
|
close(f);
|
||||||
errno = e;
|
errno = e;
|
||||||
|
Loading…
Reference in New Issue
Block a user