diff options
| author |   pk <pk@NetBSD.org> | 1996-05-19 20:22:09 +0000 |
|---|---|---|
| committer | pk <pk@NetBSD.org> | 1996-05-19 20:22:09 +0000 |
| commit | 711ef65c66491e5359a0d14ba54d977ebef5dc3f (patch) | |
| tree | 6b4a8b249503ce3f7795d0ed405c1a43413cc78f /snake | |
| parent | 926662e765d3d4833618f343458f8279494a6604 (diff) | |
| download | bsdgames-darwin-711ef65c66491e5359a0d14ba54d977ebef5dc3f.tar.gz bsdgames-darwin-711ef65c66491e5359a0d14ba54d977ebef5dc3f.tar.zst bsdgames-darwin-711ef65c66491e5359a0d14ba54d977ebef5dc3f.zip | |
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).
Diffstat (limited to 'snake')
| -rw-r--r-- | snake/snake/move.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/snake/snake/move.c b/snake/snake/move.c index 5a90795d..3a7d61d6 100644 --- a/snake/snake/move.c +++ b/snake/snake/move.c @@ -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 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)move.c 8.1 (Berkeley) 7/19/93"; #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 /* not lint */ @@ -642,14 +642,23 @@ getcap() if (xPC) PC = *xPC; - NDlength = strlen(ND); - BSlength = strlen(BS); 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, "cursor or home + 4 local motions\n"); 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")) { fprintf(stderr, "Terminal must not overstrike\n"); exit(5); |