diff options
author | Ingo Schwarze <schwarze@openbsd.org> | 2015-01-31 00:12:41 +0000 |
---|---|---|
committer | Ingo Schwarze <schwarze@openbsd.org> | 2015-01-31 00:12:41 +0000 |
commit | 4ac6265c00a615f1c73a9e93009e46865afcdfd9 (patch) | |
tree | 84bf9628732ac7eeef73923d3f6f0f0f66bbc5ce /term.c | |
parent | 6c75cc18099b6c7db33c10df54276a2baeb97ae3 (diff) | |
download | mandoc-4ac6265c00a615f1c73a9e93009e46865afcdfd9.tar.gz mandoc-4ac6265c00a615f1c73a9e93009e46865afcdfd9.tar.zst mandoc-4ac6265c00a615f1c73a9e93009e46865afcdfd9.zip |
Use relative offsets instead of absolute pointers for the terminal
font stack. The latter fail after the stack is grown with realloc().
Fixing an assertion failure found by jsg@ with afl some time ago
(test case number 51).
Diffstat (limited to 'term.c')
-rw-r--r-- | term.c | 22 |
1 files changed, 7 insertions, 15 deletions
@@ -1,4 +1,4 @@ -/* $Id: term.c,v 1.243 2015/01/21 20:33:25 schwarze Exp $ */ +/* $Id: term.c,v 1.244 2015/01/31 00:12:41 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org> @@ -363,22 +363,14 @@ term_fontpush(struct termp *p, enum termfont f) p->fontq[p->fonti] = f; } -/* Retrieve pointer to current font. */ -const enum termfont * -term_fontq(struct termp *p) -{ - - return(&p->fontq[p->fonti]); -} - /* Flush to make the saved pointer current again. */ void -term_fontpopq(struct termp *p, const enum termfont *key) +term_fontpopq(struct termp *p, int i) { - while (p->fonti >= 0 && key < p->fontq + p->fonti) - p->fonti--; - assert(p->fonti >= 0); + assert(i >= 0); + if (p->fonti > i) + p->fonti = i; } /* Pop one font off the stack. */ @@ -568,7 +560,7 @@ encode1(struct termp *p, int c) if (p->col + 6 >= p->maxcols) adjbuf(p, p->col + 6); - f = *term_fontq(p); + f = p->fontq[p->fonti]; if (TERMFONT_UNDER == f || TERMFONT_BI == f) { p->buf[p->col++] = '_'; @@ -600,7 +592,7 @@ encode(struct termp *p, const char *word, size_t sz) * character by character. */ - if (*term_fontq(p) == TERMFONT_NONE) { + if (p->fontq[p->fonti] == TERMFONT_NONE) { if (p->col + sz >= p->maxcols) adjbuf(p, p->col + sz); for (i = 0; i < sz; i++) |