diff options
| -rw-r--r-- | read.c | 22 | ||||
| -rw-r--r-- | regress/roff/de/Makefile | 9 | ||||
| -rw-r--r-- | regress/roff/de/infinite.in | 14 | ||||
| -rw-r--r-- | regress/roff/de/infinite.out_ascii | 9 | ||||
| -rw-r--r-- | regress/roff/de/infinite.out_lint | 1 |
5 files changed, 44 insertions, 11 deletions
@@ -1,4 +1,4 @@ -/* $Id: read.c,v 1.162 2017/03/06 17:26:05 schwarze Exp $ */ +/* $Id: read.c,v 1.163 2017/03/07 20:00:08 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010-2017 Ingo Schwarze <schwarze@openbsd.org> @@ -66,7 +66,7 @@ struct mparse { static void choose_parser(struct mparse *); static void resize_buf(struct buf *, size_t); -static void mparse_buf_r(struct mparse *, struct buf, size_t, int); +static int mparse_buf_r(struct mparse *, struct buf, size_t, int); static int read_whole_file(struct mparse *, const char *, int, struct buf *, int *); static void mparse_end(struct mparse *); @@ -310,7 +310,7 @@ choose_parser(struct mparse *curp) * macros, inline equations, and input line traps) * and indirectly (for .so file inclusion). */ -static void +static int mparse_buf_r(struct mparse *curp, struct buf blk, size_t i, int start) { const struct tbl_span *span; @@ -511,13 +511,16 @@ rerun: switch (rr) { case ROFF_REPARSE: - if (REPARSE_LIMIT >= ++curp->reparse_count) - mparse_buf_r(curp, ln, of, 0); - else + if (++curp->reparse_count > REPARSE_LIMIT) mandoc_msg(MANDOCERR_ROFFLOOP, curp, curp->line, pos, NULL); - pos = 0; - continue; + else if (mparse_buf_r(curp, ln, of, 0) == 1 || + start == 1) { + pos = 0; + continue; + } + free(ln.buf); + return 0; case ROFF_APPEND: pos = strlen(ln.buf); continue; @@ -531,7 +534,7 @@ rerun: (i >= blk.sz || blk.buf[i] == '\0')) { curp->sodest = mandoc_strdup(ln.buf + of); free(ln.buf); - return; + return 1; } /* * We remove `so' clauses from our lookaside @@ -597,6 +600,7 @@ rerun: } free(ln.buf); + return 1; } static int diff --git a/regress/roff/de/Makefile b/regress/roff/de/Makefile index 9488ce05..43bcf00f 100644 --- a/regress/roff/de/Makefile +++ b/regress/roff/de/Makefile @@ -1,7 +1,12 @@ # $OpenBSD: Makefile,v 1.9 2015/02/03 19:37:25 schwarze Exp $ -REGRESS_TARGETS = append cond escname factorial indir startde TH Dd -LINT_TARGETS = escname indir +REGRESS_TARGETS = append cond escname factorial indir infinite startde TH Dd +LINT_TARGETS = escname indir infinite + +# groff-1.22.3 defect: +# infinite recursion aborts output completely + +SKIP_GROFF = infinite .include <bsd.regress.mk> diff --git a/regress/roff/de/infinite.in b/regress/roff/de/infinite.in new file mode 100644 index 00000000..683eba7f --- /dev/null +++ b/regress/roff/de/infinite.in @@ -0,0 +1,14 @@ +.Dd March 7, 2017 +.Dt DE-INFINITE 1 +.Os OpenBSD +.Sh NAME +.Nm de-infinite +.Nd inifinte recursion in a user-defined macro +.Sh DESCRIPTION +initial text +.de mym +.mym +not printed +.. +.mym +final text diff --git a/regress/roff/de/infinite.out_ascii b/regress/roff/de/infinite.out_ascii new file mode 100644 index 00000000..7f8210ab --- /dev/null +++ b/regress/roff/de/infinite.out_ascii @@ -0,0 +1,9 @@ +DE-INFINITE(1) General Commands Manual DE-INFINITE(1) + +NNAAMMEE + ddee--iinnffiinniittee - inifinte recursion in a user-defined macro + +DDEESSCCRRIIPPTTIIOONN + initial text final text + +OpenBSD March 7, 2017 OpenBSD diff --git a/regress/roff/de/infinite.out_lint b/regress/roff/de/infinite.out_lint new file mode 100644 index 00000000..168c7be4 --- /dev/null +++ b/regress/roff/de/infinite.out_lint @@ -0,0 +1 @@ +mandoc: infinite.in:13:5: ERROR: input stack limit exceeded, infinite loop? |