diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2012-11-19 22:30:58 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2012-11-19 22:30:58 +0000 |
| commit | e0775496049b1f1c4aa21434142ccda12eb3146b (patch) | |
| tree | af7d5ed84f6a906599d458f0b7d917f7daee5509 /mdoc_macro.c | |
| parent | dc409878671ea1571807749a48b645dd88048385 (diff) | |
| download | mandoc-e0775496049b1f1c4aa21434142ccda12eb3146b.tar.gz mandoc-e0775496049b1f1c4aa21434142ccda12eb3146b.tar.zst mandoc-e0775496049b1f1c4aa21434142ccda12eb3146b.zip | |
Do not crash on stray .Ta macros found outside column lists.
Problem reported by jmc@, thanks.
Diffstat (limited to 'mdoc_macro.c')
| -rw-r--r-- | mdoc_macro.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/mdoc_macro.c b/mdoc_macro.c index 1cec1ecd..7e143e02 100644 --- a/mdoc_macro.c +++ b/mdoc_macro.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_macro.c,v 1.120 2012/11/18 00:05:35 schwarze Exp $ */ +/* $Id: mdoc_macro.c,v 1.121 2012/11/19 22:30:58 schwarze Exp $ */ /* * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010, 2012 Ingo Schwarze <schwarze@openbsd.org> @@ -1759,16 +1759,22 @@ phrase(struct mdoc *mdoc, int line, int ppos, char *buf) static int phrase_ta(MACRO_PROT_ARGS) { + struct mdoc_node *n; int la; enum mdoct ntok; enum margserr ac; char *p; - /* - * FIXME: this is overly restrictive: if the `Ta' is unexpected, - * it should simply error out with ARGSLOST. - */ + /* Make sure we are in a column list or ignore this macro. */ + n = mdoc->last; + while (NULL != n && MDOC_Bl != n->tok) + n = n->parent; + if (NULL == n || LIST_column != n->norm->Bl.type) { + mdoc_pmsg(mdoc, line, ppos, MANDOCERR_STRAYTA); + return(1); + } + /* Advance to the next column. */ if ( ! rew_sub(MDOC_BODY, mdoc, MDOC_It, line, ppos)) return(0); if ( ! mdoc_body_alloc(mdoc, line, ppos, MDOC_It)) |