github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-02-21 05:01:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix ncurses memory leak in init_curses()

Browse Source 
init_curses() is/can be called more than once, in which case the previous
ncurses terminal state is leaked and a new one is allocated.

`del_curterm(cur_term)` is supposed to be called prior to calling `setupterm()`
if `setupterm()` is being used to reinit the default `TERMINAL *cur_term`.
This commit is contained in:
Mahmoud Al-Qudsi 2023-05-01 12:04:26 -05:00
parent 905430629d
commit 73983bada5
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/env_dispatch.cpp
View File

@ -565,6 +565,15 @@ static bool does_term_support_setting_title(const environment_t &vars) {
return true;
}
extern "C" {
void env_cleanup() {
if (cur_term != nullptr) {
del_curterm(cur_term);
cur_term = nullptr;
}
}
}
/// Initialize the curses subsystem.
static void init_curses(const environment_t &vars) {
for (const auto &var_name : curses_variables) {
@ -580,6 +589,10 @@ static void init_curses(const environment_t &vars) {
}
}
// init_curses() is called more than once, which can lead to a memory leak if the previous
// ncurses TERMINAL isn't freed before initializing it again with `setupterm()`.
env_cleanup();
int err_ret{0};
if (setupterm(nullptr, STDOUT_FILENO, &err_ret) == ERR) {
if (is_interactive_session()) {