summaryrefslogtreecommitdiffstats
path: root/term_ps.c
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2020-09-06 14:45:22 +0000
committerIngo Schwarze <schwarze@openbsd.org>2020-09-06 14:45:22 +0000
commitce34a184400c15c0324318f71fac755b70d2b4d3 (patch)
tree4291e3ae876202e5825753a53c7dc786f10cfe59 /term_ps.c
parent38a9a96f12c6e309ad13d80ad67eca1c656a0bf4 (diff)
downloadmandoc-ce34a184400c15c0324318f71fac755b70d2b4d3.tar.gz
After .ti, there are many reasons why the offset may change, so setting
it back later requires a guard against underflow, or subsequent assertions may fail. Issue found in an afl run performed by Jan Schreiber <jes at posteo dot de>.
Diffstat (limited to 'term_ps.c')
-rw-r--r--term_ps.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/term_ps.c b/term_ps.c
index 5bbc3068..567f3ed1 100644
--- a/term_ps.c
+++ b/term_ps.c
@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $Id$ */
/*
* Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2014, 2015, 2016, 2017 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2014,2015,2016,2017,2020 Ingo Schwarze <schwarze@openbsd.org>
* Copyright (c) 2017 Marc Espie <espie@openbsd.org>
*
* Permission to use, copy, modify, and distribute this software for any
@@ -1252,7 +1252,10 @@ ps_endline(struct termp *p)
ps_closepage(p);
- p->tcol->offset -= p->ti;
+ if ((int)p->tcol->offset > p->ti)
+ p->tcol->offset -= p->ti;
+ else
+ p->tcol->offset = 0;
p->ti = 0;
}