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

Do not allow opening files whose size we cannot express in an int

Browse Source
This commit is contained in:
Maxime Coste 2017-10-30 17:48:15 +11:00
parent 40eb598065
commit cd215ccee9
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/file.cc
View File

@ -185,6 +185,7 @@ String read_file(StringView filename, bool text)
} }
MappedFile::MappedFile(StringView filename) MappedFile::MappedFile(StringView filename)
: data{nullptr}
{ {
fd = open(filename.zstr(), O_RDONLY | O_NONBLOCK); fd = open(filename.zstr(), O_RDONLY | O_NONBLOCK);
if (fd == -1) if (fd == -1)
@ -194,13 +195,22 @@ MappedFile::MappedFile(StringView filename)
if (S_ISDIR(st.st_mode)) if (S_ISDIR(st.st_mode))
throw file_access_error(filename, "is a directory"); throw file_access_error(filename, "is a directory");
if (st.st_size == 0)
return;
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)
throw file_access_error{filename, strerror(errno)};
if (st.st_size > std::numeric_limits<int>::max())
throw runtime_error("file is too big");
} }
MappedFile::~MappedFile() MappedFile::~MappedFile()
{ {
if (fd != -1) if (fd != -1)
{ {
if (data != nullptr)
munmap((void*)data, st.st_size); munmap((void*)data, st.st_size);
close(fd); close(fd);
} }