From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from scc-mailout.scc.kit.edu (scc-mailout.scc.kit.edu [129.13.185.201]) by krisdoz.my.domain (8.14.3/8.14.3) with ESMTP id p9MLPdcD004326 for ; Sat, 22 Oct 2011 17:25:39 -0400 (EDT) Received: from hekate.usta.de (asta-nat.asta.uni-karlsruhe.de [172.22.63.82]) by scc-mailout-01.scc.kit.edu with esmtp (Exim 4.72 #1) id 1RHj4V-0004ok-09; Sat, 22 Oct 2011 23:25:39 +0200 Received: from donnerwolke.usta.de ([172.24.96.3]) by hekate.usta.de with esmtp (Exim 4.72) (envelope-from ) id 1RHj3j-0005GE-Pr for tech@mdocml.bsd.lv; Sat, 22 Oct 2011 23:24:51 +0200 Received: from iris.usta.de ([172.24.96.5] helo=usta.de) by donnerwolke.usta.de with esmtp (Exim 4.72) (envelope-from ) id 1RHj4U-0001Pp-UX for tech@mdocml.bsd.lv; Sat, 22 Oct 2011 23:25:38 +0200 Received: from schwarze by usta.de with local (Exim 4.72) (envelope-from ) id 1RHijW-0002ap-Fl for tech@mdocml.bsd.lv; Sat, 22 Oct 2011 23:03:58 +0200 Date: Sat, 22 Oct 2011 23:03:58 +0200 From: Ingo Schwarze To: tech@mdocml.bsd.lv Subject: infinite recursion regression fix Message-ID: <20111022210358.GB8614@iris.usta.de> X-Mailinglist: mdocml-tech Reply-To: tech@mdocml.bsd.lv MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Hi, one of the recent releases introduced a regression with respect to infinite recursion: When string expansion exceeds the recursion limit, groff drops the input line, and mandoc used to do the same. Current mandoc, however, just leaves the string unexpanded. The following patch restores compatible behaviour. OK? Ingo Index: roff.c =================================================================== RCS file: /cvs/src/usr.bin/mandoc/roff.c,v retrieving revision 1.44 diff -u -p -r1.44 roff.c --- roff.c 19 Sep 2011 07:53:54 -0000 1.44 +++ roff.c 22 Oct 2011 21:20:23 -0000 @@ -182,7 +182,7 @@ static void roff_openeqn(struct roff * int, int, const char *); static enum rofft roff_parse(struct roff *, const char *, int *); static enum rofferr roff_parsetext(char *); -static void roff_res(struct roff *, +static enum rofferr roff_res(struct roff *, char **, size_t *, int, int); static enum rofferr roff_rm(ROFF_ARGS); static void roff_setstr(struct roff *, @@ -428,7 +428,7 @@ roff_alloc(struct mparse *parse) * is processed. * This also checks the syntax of regular escapes. */ -static void +static enum rofferr roff_res(struct roff *r, char **bufp, size_t *szp, int ln, int pos) { enum mandoc_esc esc; @@ -454,7 +454,7 @@ again: */ if ('\0' == *cp) - return; + return(ROFF_CONT); if ('*' != *cp) { res = cp; @@ -465,7 +465,7 @@ again: mandoc_msg (MANDOCERR_BADESCAPE, r->parse, ln, (int)(stesc - *bufp), NULL); - return; + return(ROFF_CONT); } cp++; @@ -478,7 +478,7 @@ again: switch (*cp) { case ('\0'): - return; + return(ROFF_CONT); case ('('): cp++; maxl = 2; @@ -501,7 +501,7 @@ again: (MANDOCERR_BADESCAPE, r->parse, ln, (int)(stesc - *bufp), NULL); - return; + return(ROFF_CONT); } if (0 == maxl && ']' == *cp) break; @@ -542,8 +542,9 @@ again: /* Just leave the string unexpanded. */ mandoc_msg(MANDOCERR_ROFFLOOP, r->parse, ln, pos, NULL); - return; + return(ROFF_IGN); } + return(ROFF_CONT); } /* @@ -600,7 +601,10 @@ roff_parseln(struct roff *r, int ln, cha * words to fill in. */ - roff_res(r, bufp, szp, ln, pos); + e = roff_res(r, bufp, szp, ln, pos); + if (ROFF_IGN == e) + return(e); + assert(ROFF_CONT == e); ppos = pos; ctl = mandoc_getcontrol(*bufp, &pos); -- To unsubscribe send an email to tech+unsubscribe@mdocml.bsd.lv