diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2014-12-28 14:16:26 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2014-12-28 14:16:26 +0000 |
| commit | f39353f2335ef79f686c763d3cc3777bf474dacc (patch) | |
| tree | 0ca55a440827681b3aa2586ef7c7544e933915eb /roff.c | |
| parent | a0fabe9e5d1cf74cb10020f34f185de90187b8e7 (diff) | |
| download | mandoc-f39353f2335ef79f686c763d3cc3777bf474dacc.tar.gz mandoc-f39353f2335ef79f686c763d3cc3777bf474dacc.tar.zst mandoc-f39353f2335ef79f686c763d3cc3777bf474dacc.zip | |
improve previous: do the size check up front to avoid leaking memory
Diffstat (limited to 'roff.c')
| -rw-r--r-- | roff.c | 12 |
1 files changed, 5 insertions, 7 deletions
@@ -1,4 +1,4 @@ -/* $Id: roff.c,v 1.245 2014/12/25 17:23:32 schwarze Exp $ */ +/* $Id: roff.c,v 1.246 2014/12/28 14:16:26 schwarze Exp $ */ /* * Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org> @@ -651,6 +651,10 @@ roff_res(struct roff *r, struct buf *buf, int ln, int pos) r->parse, ln, (int)(stesc - buf->buf), "%.*s", (int)naml, stnam); res = ""; + } else if (buf->sz + strlen(res) > SHRT_MAX) { + mandoc_msg(MANDOCERR_ROFFLOOP, r->parse, + ln, (int)(stesc - buf->buf), NULL); + return(ROFF_IGN); } /* Replace the escape sequence by the string. */ @@ -659,12 +663,6 @@ roff_res(struct roff *r, struct buf *buf, int ln, int pos) buf->sz = mandoc_asprintf(&nbuf, "%s%s%s", buf->buf, res, cp) + 1; - if (buf->sz > SHRT_MAX) { - mandoc_msg(MANDOCERR_ROFFLOOP, r->parse, - ln, (int)(stesc - buf->buf), NULL); - return(ROFF_IGN); - } - /* Prepare for the next replacement. */ start = nbuf + pos; |