summaryrefslogtreecommitdiffstats
path: root/usr.bin
diff options
context:
space:
mode:
authorcsgr <csgr@FreeBSD.org>1994-09-08 21:30:51 +0000
committercsgr <csgr@FreeBSD.org>1994-09-08 21:30:51 +0000
commit134df3f722c929c34de709c1a205eb56d430c56a (patch)
treee42e8267d3ba5934bd746bc5e5c3d91bf48a5954 /usr.bin
parent7ca8cf71da0aa32305b0f45ca0738b7cc8ac01e8 (diff)
downloadFreeBSD-src-134df3f722c929c34de709c1a205eb56d430c56a.zip
FreeBSD-src-134df3f722c929c34de709c1a205eb56d430c56a.tar.gz
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.
Diffstat (limited to 'usr.bin')
-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 c721f4e..2205f1f 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.
OpenPOWER on IntegriCloud