p/termo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Try to fix terminfo loading

Browse Source 
It could lead to crashing the PTY under OpenBSD and ncurses.

Fixed some unibiliums leaks while at it.
This commit is contained in:
Přemysl Eric Janouch 2016-11-03 02:25:47 +01:00
parent c1251f3978
commit 059cb81817
Signed by: p
GPG Key ID: B715679E3A361BE6
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
driver-ti.c
View File

@ -177,6 +177,7 @@ static bool
load_terminfo (termo_ti_t *ti, const char *term) load_terminfo (termo_ti_t *ti, const char *term)
{ {
const char *mouse_report_string = NULL; const char *mouse_report_string = NULL;
bool result = false;
#ifdef HAVE_UNIBILIUM #ifdef HAVE_UNIBILIUM
unibi_term *unibi = unibi_from_term (term); unibi_term *unibi = unibi_from_term (term);
@ -191,8 +192,12 @@ load_terminfo (termo_ti_t *ti, const char *term)
// Have to cast away the const. But it's OK - we know terminfo won't // Have to cast away the const. But it's OK - we know terminfo won't
// really modify term // really modify term
int err; int err;
TERMINAL *saved_term = set_curterm (NULL);
if (setupterm ((char *) term, 1, &err) != OK) if (setupterm ((char *) term, 1, &err) != OK)
{
set_curterm (saved_term);
return false; return false;
}
for (int i = 0; strfnames[i]; i++) for (int i = 0; strfnames[i]; i++)
{ {
@ -227,8 +232,7 @@ load_terminfo (termo_ti_t *ti, const char *term)
if (node && !insert_seq (ti, value, node)) if (node && !insert_seq (ti, value, node))
{ {
free (node); free (node);
// FIXME: unibi leak goto fail;
return false;
} }
} }
@ -255,14 +259,13 @@ load_terminfo (termo_ti_t *ti, const char *term)
trie_node_t *node = malloc (sizeof *node); trie_node_t *node = malloc (sizeof *node);
if (!node) if (!node)
return false; goto fail;
node->type = TYPE_MOUSE; node->type = TYPE_MOUSE;
if (!insert_seq (ti, mouse_report_string, node)) if (!insert_seq (ti, mouse_report_string, node))
{ {
free (node); free (node);
// FIXME: unibi leak goto fail;
return false;
} }
} }
@ -305,11 +308,14 @@ load_terminfo (termo_ti_t *ti, const char *term)
else else
ti->stop_string = NULL; ti->stop_string = NULL;
result = true;
fail:
#ifdef HAVE_UNIBILIUM #ifdef HAVE_UNIBILIUM
unibi_destroy (unibi); unibi_destroy (unibi);
#else
del_curterm (set_curterm (saved_term));
#endif #endif
return result;
return true;
} }
static bool static bool