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

Fix fatal exception when checking if buffer needs to be reloaded

Browse Source 
If, for example, the buffer path now is a directory, MappedFile will
throw on construction. Using a try block to explicitely allow errors
fixes the issue.
This commit is contained in:
Maxime Coste 2023-02-21 16:59:16 +11:00
parent be49f36205
commit fa060c2a17
1 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/client.cc
View File

@ -367,31 +367,38 @@ void Client::check_if_buffer_needs_reloading()
if (not (buffer.flags() & Buffer::Flags::File) or reload == Autoreload::No)
return;
const String& filename = buffer.name();
const timespec ts = get_fs_timestamp(filename);
const auto status = buffer.fs_status();
if (ts == InvalidTime or ts == status.timestamp)
return;
if (MappedFile fd{filename};
fd.st.st_size == status.file_size and hash_data(fd.data, fd.st.st_size) == status.hash)
return;
if (reload == Autoreload::Ask)
try
{
StringView bufname = buffer.display_name();
info_show(format("reload '{}' ?", bufname),
format("'{}' was modified externally\n"
" y, <ret>: reload | n, <esc>: keep\n"
" Y: always reload | N: always keep\n",
bufname), {}, InfoStyle::Modal);
const String& filename = buffer.name();
const timespec ts = get_fs_timestamp(filename);
const auto status = buffer.fs_status();
m_buffer_reload_dialog_opened = true;
m_input_handler.on_next_key("buffer-reload", KeymapMode::None, [this](Key key, Context&){ on_buffer_reload_key(key); });
if (ts == InvalidTime or ts == status.timestamp)
return;
if (MappedFile fd{filename};
fd.st.st_size == status.file_size and hash_data(fd.data, fd.st.st_size) == status.hash)
return;
if (reload == Autoreload::Ask)
{
StringView bufname = buffer.display_name();
info_show(format("reload '{}' ?", bufname),
format("'{}' was modified externally\n"
" y, <ret>: reload | n, <esc>: keep\n"
" Y: always reload | N: always keep\n",
bufname), {}, InfoStyle::Modal);
m_buffer_reload_dialog_opened = true;
m_input_handler.on_next_key("buffer-reload", KeymapMode::None, [this](Key key, Context&){ on_buffer_reload_key(key); });
}
else
reload_buffer();
}
catch (Kakoune::runtime_error& error)
{
write_to_debug_buffer(format("Error while checking if buffer {} changed: {}", buffer.name(), error.what()));
}
else
reload_buffer();
}
StringView Client::get_env_var(StringView name) const