diff options
author | Ingo Schwarze <schwarze@openbsd.org> | 2013-06-01 04:56:50 +0000 |
---|---|---|
committer | Ingo Schwarze <schwarze@openbsd.org> | 2013-06-01 04:56:50 +0000 |
commit | 30db3fcdde288bc9fef7a66ce0cb4231bd941bba (patch) | |
tree | ea0976081f5cffadcce2f4234975b85c843f1c65 /tbl_data.c | |
parent | c1b7370d9954e5b822279efca805c0e8a7c7f379 (diff) | |
download | mandoc-30db3fcdde288bc9fef7a66ce0cb4231bd941bba.tar.gz mandoc-30db3fcdde288bc9fef7a66ce0cb4231bd941bba.tar.zst mandoc-30db3fcdde288bc9fef7a66ce0cb4231bd941bba.zip |
If a table contained at least one complete line
and on its last line, the first T{ remained unclosed,
roff_parseln() never returned ROFF_TBL for that last line,
so {man,mdoc}_addspan() never got called for that last line,
so we ended up with a table
where no line associated with a node had TBL_SPAN_LAST set,
so tbl_term() never free()'d the cols in struct roffcol,
so tblcalc() crashed on the NULL == tbl->cols assertion
when starting the *next* table in the same file.
Fix this by returning ROFF_TBL as soon as we open a data cell,
not only when finishing it - as explained above, it may never
get properly closed but instead be interrupted by .TE.
Problem reported by bentley@ in latex2man.1.
I love it when bugs take half a day to debug but
the fix turns out to be flipping one single bit in the source code.
Diffstat (limited to 'tbl_data.c')
-rw-r--r-- | tbl_data.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $Id: tbl_data.c,v 1.26 2013/05/31 21:37:17 schwarze Exp $ */ +/* $Id: tbl_data.c,v 1.27 2013/06/01 04:56:50 schwarze Exp $ */ /* * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org> @@ -102,7 +102,7 @@ data(struct tbl_node *tbl, struct tbl_span *dp, if (*pos - sv == 2 && 'T' == p[sv] && '{' == p[sv + 1]) { tbl->part = TBL_PART_CDATA; - return(0); + return(1); } assert(*pos - sv >= 0); |