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 /out.c | |
| 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.
Diffstat (limited to 'out.c')
| -rw-r--r-- | out.c | 7 |
1 files changed, 5 insertions, 2 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 |