more: fix repeat search crash

Repeating a search for a pattern that did not found made more(1) to
crash.  To reproduce 'more /etc/services' and search for 'doom'; you will
find a service in port 666 - pressing '.' after that result used to cause
core dump.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>

diff --git a/text-utils/more.c b/text-utils/more.c
index 74148a7abb45b705c21e215ada54975c995af8f3..94b04550690da0b989f3781aae298b9fe5475d81 100644 (file)
--- a/text-utils/more.c
+++ b/text-utils/more.c
@@ -1605,6 +1605,8 @@ void search(char buf[], FILE *file, register int n)
        context.line = saveln = Currline;
        context.chrctr = startline;
        lncount = 0;
+       if (!buf)
+               goto notfound;
        if ((rc = regcomp(&re, buf, REG_NOSUB)) != 0) {
                char s[REGERR_BUF];
                regerror(rc, &re, s, sizeof s);
@@ -1661,6 +1663,7 @@ void search(char buf[], FILE *file, register int n)
                }
                free(previousre);
                previousre = NULL;
+notfound:
                more_error(_("Pattern not found"));
        }
 }