From 54decef946b157db26e5467dce2ce612c33a61ad Mon Sep 17 00:00:00 2001 From: Sam Leffler Date: Wed, 9 Feb 1983 23:17:59 -0800 Subject: [PATCH] null pointer bugs SCCS-vsn: old/more/more.c 4.8 --- usr/src/old/more/more.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/usr/src/old/more/more.c b/usr/src/old/more/more.c index b686a18a4c..0d84b2b433 100644 --- a/usr/src/old/more/more.c +++ b/usr/src/old/more/more.c @@ -1,4 +1,4 @@ -static char *sccsid = "@(#)more.c 4.7 (Berkeley) 82/12/14"; +static char *sccsid = "@(#)more.c 4.8 (Berkeley) 83/02/09"; /* ** more.c - General purpose tty output filter and file perusal program @@ -1306,10 +1306,11 @@ initterm () char clearbuf[100]; char *clearptr, *padstr; int ldisc; + char *term; setbuf(stdout, obuf); if (!(no_tty = gtty(1, &otty))) { - if (tgetent(buf, getenv("TERM")) <= 0) { + if ((term = getenv("TERM")) || tgetent(buf, term) <= 0) { dumb++; ul_opt = 0; } else { @@ -1351,7 +1352,7 @@ initterm () if (padstr = tgetstr("pc", &clearptr)) PC = *padstr; Home = tgetstr("ho",&clearptr); - if (*Home == '\0') + if (Home == 0 || *Home == '\0') { if ((cursorm = tgetstr("cm", &clearptr)) != NULL) { strcpy(cursorhome, tgoto(cursorm, 0, 0)); -- 2.20.1