aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/tbl_html.c
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2017-07-31 16:14:10 +0000
committerIngo Schwarze <schwarze@openbsd.org>2017-07-31 16:14:10 +0000
commit4727ab9b79013eaa6f5c39488cdaf53604a34943 (patch)
treeddbf969022a815d2c070198e802cee7d745c2597 /tbl_html.c
parentea3e75363c1a526374ce4922e3ad0823294ef755 (diff)
downloadmandoc-4727ab9b79013eaa6f5c39488cdaf53604a34943.tar.gz
mandoc-4727ab9b79013eaa6f5c39488cdaf53604a34943.tar.zst
mandoc-4727ab9b79013eaa6f5c39488cdaf53604a34943.zip
Ignore explicitly specified negative column widths rather than
wrapping around to huge numbers and risking memory exhaustion; fixes Debian ps(1). Bug reported by Dr. Markus Waldeck.
Diffstat (limited to 'tbl_html.c')
-rw-r--r--tbl_html.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/tbl_html.c b/tbl_html.c
index 06fae5eb..d59f1635 100644
--- a/tbl_html.c
+++ b/tbl_html.c
@@ -1,4 +1,4 @@
-/* $Id: tbl_html.c,v 1.22 2017/06/12 20:14:18 schwarze Exp $ */
+/* $Id: tbl_html.c,v 1.23 2017/07/31 16:14:10 schwarze Exp $ */
/*
* Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -49,6 +49,9 @@ html_tbl_strlen(const char *p, void *arg)
static size_t
html_tbl_sulen(const struct roffsu *su, void *arg)
{
+ if (su->scale < 0.0)
+ return 0;
+
switch (su->unit) {
case SCALE_FS: /* 2^16 basic units */
return su->scale * 65536.0 / 24.0;