Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-29 14:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "history_file_contents_t::create: remove constant comparison"

Browse source 
This reverts commit d7b4193978.

off_t may be wider than size_t on a 32 bit system so the comparison is
justified (though the cast is not).
This commit is contained in:
ridiculousfish 2022-04-01 10:18:06 -07:00
parent d7b4193978
commit a91e1a8cab
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/history_file.cpp
View file

@ -157,7 +157,7 @@ bool history_file_contents_t::infer_file_type() {
std::unique_ptr<history_file_contents_t> history_file_contents_t::create(int fd) { std::unique_ptr<history_file_contents_t> history_file_contents_t::create(int fd) {
// Check that the file is seekable, and its size. // Check that the file is seekable, and its size.
off_t len = lseek(fd, 0, SEEK_END); off_t len = lseek(fd, 0, SEEK_END);
if (len <= 0) return nullptr; if (len <= 0 || static_cast<unsigned long>(len) >= SIZE_MAX) return nullptr;
bool mmap_file_directly = should_mmap(); bool mmap_file_directly = should_mmap();
std::unique_ptr<mmap_region_t> region = std::unique_ptr<mmap_region_t> region =