summaryrefslogtreecommitdiffstats
path: root/usr.bin/mandoc/tbl.c
diff options
context:
space:
mode:
authorschwarze <schwarze@openbsd.org>2015-01-30 17:31:20 +0000
committerschwarze <schwarze@openbsd.org>2015-01-30 17:31:20 +0000
commitcb1515965e22f6ee49d207ee6fbe66f94e9230ba (patch)
tree02f8cc31065f881e03a8b83aa7744c996bdb4d79 /usr.bin/mandoc/tbl.c
parentremove rndc (from bind) as well, ok deraadt (diff)
downloadwireguard-openbsd-cb1515965e22f6ee49d207ee6fbe66f94e9230ba.tar.xz
wireguard-openbsd-cb1515965e22f6ee49d207ee6fbe66f94e9230ba.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 '')
-rw-r--r--usr.bin/mandoc/tbl.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/usr.bin/mandoc/tbl.c b/usr.bin/mandoc/tbl.c
index 9af8a34a6a1..af145363190 100644
--- a/usr.bin/mandoc/tbl.c
+++ b/usr.bin/mandoc/tbl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tbl.c,v 1.19 2015/01/30 04:08:37 schwarze Exp $ */
+/* $OpenBSD: tbl.c,v 1.20 2015/01/30 17:31:20 schwarze Exp $ */
/*
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2011, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -177,9 +177,5 @@ tbl_end(struct tbl_node **tblp)
tbl->line, tbl->pos, NULL);
return(0);
}
-
- if (tbl->last_span != NULL)
- tbl->last_span->flags |= TBL_SPAN_LAST;
-
return(1);
}