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

Handle malloc() failures during setup of driver-ti

This commit is contained in:
Paul LeoNerd Evans 2008-11-12 16:10:58 +00:00
parent 62c5c97080
commit 04e1926df6
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
driver-ti.c
View File

@ -24,7 +24,7 @@ typedef struct {
} termkey_ti; } termkey_ti;
static int funcname2keysym(const char *funcname, termkey_type *typep, termkey_keysym *symp, int *modmask, int *modsetp); static int funcname2keysym(const char *funcname, termkey_type *typep, termkey_keysym *symp, int *modmask, int *modsetp);
static void register_seq(termkey_ti *ti, const char *seq, termkey_type type, termkey_keysym sym, int modmask, int modset); static int register_seq(termkey_ti *ti, const char *seq, termkey_type type, termkey_keysym sym, int modmask, int modset);
static void *new_driver(termkey_t *tk, const char *term) static void *new_driver(termkey_t *tk, const char *term)
{ {
@ -66,11 +66,15 @@ static void *new_driver(termkey_t *tk, const char *term)
continue; continue;
if(sym != TERMKEY_SYM_NONE) if(sym != TERMKEY_SYM_NONE)
register_seq(ti, value, type, sym, mask, set); if(!register_seq(ti, value, type, sym, mask, set))
goto abort_free_seqs;
} }
return ti; return ti;
abort_free_seqs:
free(ti->seqs);
abort_free_ti: abort_free_ti:
free(ti); free(ti);
@ -240,12 +244,13 @@ static int funcname2keysym(const char *funcname, termkey_type *typep, termkey_ke
return 0; return 0;
} }
static void register_seq(termkey_ti *ti, const char *seq, termkey_type type, termkey_keysym sym, int modmask, int modset) static int register_seq(termkey_ti *ti, const char *seq, termkey_type type, termkey_keysym sym, int modmask, int modset)
{ {
if(ti->nseqs == ti->alloced_seqs) { if(ti->nseqs == ti->alloced_seqs) {
ti->alloced_seqs *= 2; ti->alloced_seqs *= 2;
void *newseqs = realloc(ti->seqs, ti->alloced_seqs * sizeof(ti->seqs[9])); void *newseqs = realloc(ti->seqs, ti->alloced_seqs * sizeof(ti->seqs[9]));
// TODO: Handle realloc() failure if(!newseqs)
return 0;
ti->seqs = newseqs; ti->seqs = newseqs;
} }
@ -256,6 +261,8 @@ static void register_seq(termkey_ti *ti, const char *seq, termkey_type type, ter
ti->seqs[i].key.sym = sym; ti->seqs[i].key.sym = sym;
ti->seqs[i].key.modifier_mask = modmask; ti->seqs[i].key.modifier_mask = modmask;
ti->seqs[i].key.modifier_set = modset; ti->seqs[i].key.modifier_set = modset;
return 1;
} }
struct termkey_driver termkey_driver_ti = { struct termkey_driver termkey_driver_ti = {