xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Close MappedFile fd using on_scope_end to handle all return paths

Browse Source
This commit is contained in:
Maxime Coste 2022-02-22 20:45:50 +11:00
parent 30c05e83f8
commit b915e4e11b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/file.cc
View File

@ -211,6 +211,7 @@ MappedFile::MappedFile(StringView filename)
int fd = open(filename.zstr(), O_RDONLY | O_NONBLOCK); int fd = open(filename.zstr(), O_RDONLY | O_NONBLOCK);
if (fd == -1) if (fd == -1)
throw file_access_error(filename, strerror(errno)); throw file_access_error(filename, strerror(errno));
auto close_fd = on_scope_end([&] { close(fd); });
fstat(fd, &st); fstat(fd, &st);
if (S_ISDIR(st.st_mode)) if (S_ISDIR(st.st_mode))
@ -222,7 +223,6 @@ MappedFile::MappedFile(StringView filename)
data = (const char*)mmap(nullptr, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0); data = (const char*)mmap(nullptr, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
if (data == MAP_FAILED) if (data == MAP_FAILED)
throw file_access_error{filename, strerror(errno)}; throw file_access_error{filename, strerror(errno)};
close(fd);
} }
MappedFile::~MappedFile() MappedFile::~MappedFile()