From cb1515965e22f6ee49d207ee6fbe66f94e9230ba Mon Sep 17 00:00:00 2001 From: schwarze Date: Fri, 30 Jan 2015 17:31:20 +0000 Subject: 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. --- usr.bin/mandoc/mandoc.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'usr.bin/mandoc/mandoc.h') diff --git a/usr.bin/mandoc/mandoc.h b/usr.bin/mandoc/mandoc.h index a47a8e08df1..71f3f940e87 100644 --- a/usr.bin/mandoc/mandoc.h +++ b/usr.bin/mandoc/mandoc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mandoc.h,v 1.135 2015/01/30 04:08:37 schwarze Exp $ */ +/* $OpenBSD: mandoc.h,v 1.136 2015/01/30 17:31:20 schwarze Exp $ */ /* * Copyright (c) 2010, 2011, 2014 Kristaps Dzonsons * Copyright (c) 2010-2015 Ingo Schwarze @@ -285,9 +285,6 @@ struct tbl_span { struct tbl_span *prev; struct tbl_span *next; int line; /* parse line */ - int flags; -#define TBL_SPAN_FIRST (1 << 0) -#define TBL_SPAN_LAST (1 << 1) enum tbl_spant pos; }; -- cgit v1.2.3-59-g8ed1b