diff options
| author | Ingo Schwarze <schwarze@openbsd.org> | 2017-05-01 20:54:59 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2017-05-01 20:54:59 +0000 |
| commit | 6c15e105c300035bdfa80357fba9f423e59d4f8d (patch) | |
| tree | 26cd4021243beb6f749f3a770ae611bcda3d9f57 | |
| parent | 59d32b6b6f099db4e98d14846f92c95838026d6d (diff) | |
| download | mandoc-6c15e105c300035bdfa80357fba9f423e59d4f8d.tar.gz | |
When trying to expand some columns in a table where the sum of the
widths of the remaining columns is already wider than the line
length, underflowing size_t and dying from ENOMEM is the wrong plan.
Instead, simply refrain from expanding anything in such a situation,
avoiding a crash that tb@ found with afl.
| -rw-r--r-- | out.c | 7 | ||||
| -rw-r--r-- | regress/tbl/mod/Makefile | 2 | ||||
| -rw-r--r-- | regress/tbl/mod/expand-toowide.in | 15 | ||||
| -rw-r--r-- | regress/tbl/mod/expand-toowide.out_ascii | 23 |
4 files changed, 44 insertions, 3 deletions
@@ -1,7 +1,7 @@ /* $Id$ */ /* * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> - * Copyright (c) 2011, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org> + * Copyright (c) 2011, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org> * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -197,9 +197,12 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp, */ if (nxcol && totalwidth) { - xwidth = totalwidth - xwidth - 3*maxcol - + xwidth += 3*maxcol + (opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX) ? 2 : !!opts->lvert + !!opts->rvert); + if (xwidth >= totalwidth) + return; + xwidth = totalwidth - xwidth; /* * Emulate a bug in GNU tbl width calculation that diff --git a/regress/tbl/mod/Makefile b/regress/tbl/mod/Makefile index c5bebb0f..04eec17e 100644 --- a/regress/tbl/mod/Makefile +++ b/regress/tbl/mod/Makefile @@ -1,6 +1,6 @@ # $OpenBSD: Makefile,v 1.2 2015/02/10 11:02:19 schwarze Exp $ -REGRESS_TARGETS = badfont expand font misalign +REGRESS_TARGETS = badfont expand expand-toowide font misalign LINT_TARGETS = badfont font # groff-1.22.3 defects: diff --git a/regress/tbl/mod/expand-toowide.in b/regress/tbl/mod/expand-toowide.in new file mode 100644 index 00000000..7e8a44b8 --- /dev/null +++ b/regress/tbl/mod/expand-toowide.in @@ -0,0 +1,15 @@ +.TH TBL-MOD-EXPAND-TOOWIDE 1 "May 1, 2017" OpenBSD +.SH NAME +tbl-mod-expand-toowide \- try to expand columns in a table +that is already too wide +.SH DESCRIPTION +.ll 20n +In this section, the line length is limited to 20 characters. +.TS +tab(:); +lx l lx. +x:1234567890:x +.TE +.ll 78n +.PP +Now we are back to the default terminal width. diff --git a/regress/tbl/mod/expand-toowide.out_ascii b/regress/tbl/mod/expand-toowide.out_ascii new file mode 100644 index 00000000..066fdf90 --- /dev/null +++ b/regress/tbl/mod/expand-toowide.out_ascii @@ -0,0 +1,23 @@ +TBL-MOD-EXPAND-TOOWIDE(1) General Commands Manual TBL-MOD-EXPAND-TOOWIDE(1) + + + +NNAAMMEE + tbl-mod-expand-toowide - try to expand columns in a table that is + already too wide + +DDEESSCCRRIIPPTTIIOONN + In this + section, the + line length + is limited to + 20 + characters. + + x 1234567890 x + + Now we are back to the default terminal width. + + + +OpenBSD May 1, 2017 TBL-MOD-EXPAND-TOOWIDE(1) |