aboutsummaryrefslogtreecommitdiff
path: root/usr.bin/more
diff options
context:
space:
mode:
authorGeoff Rehmet <csgr@FreeBSD.org>1994-09-08 21:30:51 +0000
committerGeoff Rehmet <csgr@FreeBSD.org>1994-09-08 21:30:51 +0000
commit7ad3ea76c06ac9646b1b9d2742530cd9b343fa90 (patch)
treee42e8267d3ba5934bd746bc5e5c3d91bf48a5954 /usr.bin/more
parentd1f32ba5df677453a04352095875882b1aa36e32 (diff)
downloadsrc-7ad3ea76c06ac9646b1b9d2742530cd9b343fa90.tar.gz
src-7ad3ea76c06ac9646b1b9d2742530cd9b343fa90.zip
From 1.1.5.1
>From Arne Bier <csar@cs.ru.ac.za> while running more(1), if you enter ":a" to get the name of the file being viewed, more dumps core when you hit enter (as prompted). This is due to more(1) attempting to find the length of a NULL string. Submitted by: Geoff.
Notes
Notes: svn path=/head/; revision=2593
Diffstat (limited to 'usr.bin/more')
-rw-r--r--usr.bin/more/output.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/usr.bin/more/output.c b/usr.bin/more/output.c
index c721f4e63be5..2205f1f8972c 100644
--- a/usr.bin/more/output.c
+++ b/usr.bin/more/output.c
@@ -226,7 +226,7 @@ error(s)
}
lower_left();
- if (strlen(s) + sizeof(return_to_continue) +
+ if ((s==NULL)?0:(strlen(s)) + sizeof(return_to_continue) +
so_width + se_width + 1 > sc_width)
/*
* Printing the message has probably scrolled the screen.