sjs/gh-BertoldVdb-ZoneDetect
1
0
Fork 0
mirror of https://github.com/BertoldVdb/ZoneDetect.git synced 2026-04-27 14:57:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Do not leak file descriptors

Browse source
This commit is contained in:
Bertold Van den Bergh 2018-03-13 10:54:25 +01:00
parent 08716449b7
commit f83ebd4266
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
library/zonedetect.c
View file

@ -371,6 +371,9 @@ void ZDCloseDatabase(ZoneDetect* library) {
if(library->mapping) {
munmap(library->mapping, library->length);
}
if(library->fd >= 0) {
close(library->fd);
}
free(library);
}
}
@ -381,18 +384,18 @@ ZoneDetect* ZDOpenDatabase(const char* path) {
if(library) {
memset(library, 0, sizeof(*library));
int fd = open(path, O_RDONLY | O_CLOEXEC);
if(fd < 0) {
library->fd = open(path, O_RDONLY | O_CLOEXEC);
if(library->fd < 0) {
goto fail;
}
library->length = lseek(fd, 0, SEEK_END);
library->length = lseek(library->fd, 0, SEEK_END);
if(library->length <= 0) {
goto fail;
}
lseek(fd, 0, SEEK_SET);
lseek(library->fd, 0, SEEK_SET);
library->mapping = mmap(NULL, library->length, PROT_READ, MAP_PRIVATE | MAP_FILE, fd, 0);
library->mapping = mmap(NULL, library->length, PROT_READ, MAP_PRIVATE | MAP_FILE, library->fd, 0);
if(!library->mapping) {
goto fail;
}