=================================================================== RCS file: /cvs/mandoc/term.c,v retrieving revision 1.115 retrieving revision 1.118 diff -u -p -r1.115 -r1.118 --- mandoc/term.c 2009/10/27 08:26:12 1.115 +++ mandoc/term.c 2009/10/30 18:50:11 1.118 @@ -1,4 +1,4 @@ -/* $Id: term.c,v 1.115 2009/10/27 08:26:12 kristaps Exp $ */ +/* $Id: term.c,v 1.118 2009/10/30 18:50:11 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -77,9 +77,11 @@ term_alloc(enum termenc enc) { struct termp *p; - if (NULL == (p = malloc(sizeof(struct termp)))) - return(NULL); - memset(p, 0, sizeof(struct termp)); + p = calloc(1, sizeof(struct termp)); + if (NULL == p) { + fprintf(stderr, "memory exhausted\n"); + exit(EXIT_FAILURE); + } p->maxrmargin = 78; p->enc = enc; return(p); @@ -541,8 +543,10 @@ buffer(struct termp *p, char c) p->maxcols = 256; s = p->maxcols * 2; p->buf = realloc(p->buf, s); - if (NULL == p->buf) - err(1, "realloc"); /* FIXME: shouldn't be here! */ + if (NULL == p->buf) { + fprintf(stderr, "memory exhausted\n"); + exit(EXIT_FAILURE); + } p->maxcols = s; } p->buf[(int)(p->col)++] = c;