diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2015-01-30 17:32:16 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2015-01-30 17:32:16 +0000 |
| commit | 012b0a63e80b5d6c24ffc3ddc292861aa4132cc6 (patch) | |
| tree | 1b8cd94b439c7b75bd95c4f483f3886feea2ad6e /tbl_term.c | |
| parent | 71fa4361c47e9ed2f3c6521e9273fabb41aadc20 (diff) | |
| download | mandoc-012b0a63e80b5d6c24ffc3ddc292861aa4132cc6.tar.gz mandoc-012b0a63e80b5d6c24ffc3ddc292861aa4132cc6.tar.zst mandoc-012b0a63e80b5d6c24ffc3ddc292861aa4132cc6.zip | |
Delete the redundant tbl span flags, just inspect the actual data
where needed, which is less fragile.
This fixes a subtle NULL pointer access to tp->tbl.cols:
Due to a bug in the man(7) parser, the first span of a table can
end up in a .TP head, in which case tblcalc() was never called.
Found by jsg@ with afl.
Diffstat (limited to 'tbl_term.c')
| -rw-r--r-- | tbl_term.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1,4 +1,4 @@ -/* $Id: tbl_term.c,v 1.36 2015/01/30 04:11:50 schwarze Exp $ */ +/* $Id: tbl_term.c,v 1.37 2015/01/30 17:32:16 schwarze Exp $ */ /* * Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2011, 2012, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org> @@ -81,7 +81,7 @@ term_tbl(struct termp *tp, const struct tbl_span *sp) * calculate the table widths and decimal positions. */ - if (sp->flags & TBL_SPAN_FIRST) { + if (tp->tbl.cols == NULL) { term_flushln(tp); tp->tbl.len = term_tbl_len; @@ -189,7 +189,7 @@ term_tbl(struct termp *tp, const struct tbl_span *sp) * existing table configuration and set it to NULL. */ - if (sp->flags & TBL_SPAN_LAST) { + if (sp->next == NULL) { if (sp->opts->opts & (TBL_OPT_DBOX | TBL_OPT_BOX)) { tbl_hrule(tp, sp, 1); tp->skipvsp = 1; |