Avoid NULL-pointer deref and for now, simply exit if required terminal

capabilities aren't there. Since the capabilities in question are marked
`obsolete' in termcap(5), someone might want to have another look
at this someday (PR#2417).
This commit is contained in:
pk 1996-05-19 20:22:09 +00:00
parent 0bc8c28078
commit 8910e3276d
1 changed files with 14 additions and 5 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: move.c,v 1.11 1995/04/29 01:17:12 mycroft Exp $ */ /* $NetBSD: move.c,v 1.12 1996/05/19 20:22:09 pk Exp $ */
/* /*
* Copyright (c) 1980, 1993 * Copyright (c) 1980, 1993
@ -37,7 +37,7 @@
#if 0 #if 0
static char sccsid[] = "@(#)move.c 8.1 (Berkeley) 7/19/93"; static char sccsid[] = "@(#)move.c 8.1 (Berkeley) 7/19/93";
#else #else
static char rcsid[] = "$NetBSD: move.c,v 1.11 1995/04/29 01:17:12 mycroft Exp $"; static char rcsid[] = "$NetBSD: move.c,v 1.12 1996/05/19 20:22:09 pk Exp $";
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -642,14 +642,23 @@ getcap()
if (xPC) if (xPC)
PC = *xPC; PC = *xPC;
NDlength = strlen(ND);
BSlength = strlen(BS);
if ((CM == 0) && if ((CM == 0) &&
(HO == 0 | UP==0 || BS==0 || ND==0)) { (HO == 0 || UP == 0 || BS == 0 || ND == 0)) {
fprintf(stderr, "Terminal must have addressible "); fprintf(stderr, "Terminal must have addressible ");
fprintf(stderr, "cursor or home + 4 local motions\n"); fprintf(stderr, "cursor or home + 4 local motions\n");
exit(5); exit(5);
} }
if (ND == 0) {
fprintf(stderr, "Terminal must have `nd' capability\n");
exit(5);
}
NDlength = strlen(ND);
if (BS == 0) {
fprintf(stderr, "Terminal must have `bs' or `bc' capability\n");
exit(5);
}
BSlength = strlen(BS);
if (tgetflag("os")) { if (tgetflag("os")) {
fprintf(stderr, "Terminal must not overstrike\n"); fprintf(stderr, "Terminal must not overstrike\n");
exit(5); exit(5);