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 | 69dd502a67e421fe48f76ba10e1a259c9969b747 (patch) | |
| tree | a826e0e495a03aa9020cb8c8a81e71661d995a4c /out.c | |
| parent | 45a0a327d5183355d3878057425e8aa9935d70db (diff) | |
| download | mandoc-69dd502a67e421fe48f76ba10e1a259c9969b747.tar.gz mandoc-69dd502a67e421fe48f76ba10e1a259c9969b747.tar.zst mandoc-69dd502a67e421fe48f76ba10e1a259c9969b747.zip | |
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 | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -1,7 +1,7 @@ -/* $Id: out.c,v 1.62 2015/10/12 00:08:16 schwarze Exp $ */ +/* $Id: out.c,v 1.63 2017/05/01 20:54:59 schwarze Exp $ */ /* * 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 |