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

Backport TERMKEY_FLAG_NOSTART and fix two leaks

Browse Source 
...that are notably still present in the original library.
This commit is contained in:
Přemysl Eric Janouch
2016-12-30 08:30:59 +01:00
parent a9b41e41b7
commit 5b05b96ec0
3 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
termo.c
View File

@@ -425,12 +425,12 @@ termo_new (int fd, const char *encoding, int flags)
termo_set_flags (tk, flags);
const char *term = getenv ("TERM");
if (termo_init (tk, term, encoding)
&& termo_start (tk))
if (!termo_init (tk, term, encoding))
free (tk);
else if (!(flags & TERMO_FLAG_NOSTART) && !termo_start (tk))
termo_free (tk);
else
return tk;
// FIXME: resource leak on termo_start() failure
free (tk);
return NULL;
}
@@ -445,13 +445,12 @@ termo_new_abstract (const char *term, const char *encoding, int flags)
termo_set_flags (tk, flags);
if (!termo_init (tk, term, encoding))
{
free (tk);
return NULL;
}
termo_start (tk);
return tk;
else if (!(flags & TERMO_FLAG_NOSTART) && !termo_start (tk))
termo_free (tk);
else
return tk;
return NULL;
}
void