diff options
| author |   schwarze <schwarze@openbsd.org> | 2014-07-06 18:46:51 +0000 |
|---|---|---|
| committer | schwarze <schwarze@openbsd.org> | 2014-07-06 18:46:51 +0000 |
| commit | ce205d5fb71711c106cf8281cc5c6a444c55e8dd (patch) | |
| tree | 58be50df2b6e1e3ead98f7d58f42ca83164b468b | |
| parent | Fix handling of escape sequences taking numeric arguments. (diff) | |
| download | wireguard-openbsd-ce205d5fb71711c106cf8281cc5c6a444c55e8dd.tar.xz wireguard-openbsd-ce205d5fb71711c106cf8281cc5c6a444c55e8dd.zip | |
Fix expansion of escape sequences with incomplete arguments.
* For \* and \n, discard the incomplete arg, expand to empty string.
* For \B, discard the incomplete arg, expand to the digit 0.
* For \w, use the incomplete arg (behaviour unchanged).
| -rw-r--r-- | usr.bin/mandoc/roff.c | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/usr.bin/mandoc/roff.c b/usr.bin/mandoc/roff.c index 4514d50b4e1..8f6e188250e 100644 --- a/usr.bin/mandoc/roff.c +++ b/usr.bin/mandoc/roff.c @@ -1,4 +1,4 @@ -/* $Id: roff.c,v 1.90 2014/07/04 16:11:41 schwarze Exp $ */ +/* $Id: roff.c,v 1.91 2014/07/06 18:46:51 schwarze Exp $ */ /* * Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org> @@ -496,7 +496,7 @@ roff_res(struct roff *r, char **bufp, size_t *szp, int ln, int pos) size_t naml; /* actual length of the escape name */ int expand_count; /* to avoid infinite loops */ int npos; /* position in numeric expression */ - int irc; /* return code from roff_evalnum() */ + int arg_complete; /* argument not interrupted by eol */ char term; /* character terminating the escape */ expand_count = 0; @@ -581,10 +581,12 @@ roff_res(struct roff *r, char **bufp, size_t *szp, int ln, int pos) /* Advance to the end of the name. */ + arg_complete = 1; for (naml = 0; 0 == maxl || naml < maxl; naml++, cp++) { if ('\0' == *cp) { mandoc_msg(MANDOCERR_BADESCAPE, r->parse, ln, (int)(stesc - *bufp), NULL); + arg_complete = 0; break; } if (0 == maxl && *cp == term) { @@ -600,20 +602,25 @@ roff_res(struct roff *r, char **bufp, size_t *szp, int ln, int pos) switch (stesc[1]) { case '*': - res = roff_getstrn(r, stnam, naml); + if (arg_complete) + res = roff_getstrn(r, stnam, naml); break; case 'B': npos = 0; - irc = roff_evalnum(stnam, &npos, NULL, 0); - ubuf[0] = irc && stnam + npos + 1 == cp - ? '1' : '0'; + ubuf[0] = arg_complete && + roff_evalnum(stnam, &npos, NULL, 0) && + stnam + npos + 1 == cp ? '1' : '0'; ubuf[1] = '\0'; break; case 'n': - (void)snprintf(ubuf, sizeof(ubuf), "%d", - roff_getregn(r, stnam, naml)); + if (arg_complete) + (void)snprintf(ubuf, sizeof(ubuf), "%d", + roff_getregn(r, stnam, naml)); + else + ubuf[0] = '\0'; break; case 'w': + /* use even incomplete args */ (void)snprintf(ubuf, sizeof(ubuf), "%d", 24 * (int)naml); break; |