In URIs in apropos(1) result tables,

[mandoc.git] / roff.c

diff --git a/roff.c b/roff.c
index 4ee44f157e7d99d9aa16e16dc56bfaa15563f9d4..268d6470ade19460f23314ccd25ff6a3156c0cbb 100644 (file)
--- a/roff.c
+++ b/roff.c
@@ -1,7 +1,7 @@
-/*     $Id: roff.c,v 1.283 2015/10/22 21:54:23 schwarze Exp $ */
+/*     $Id: roff.c,v 1.293 2017/03/09 15:29:35 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010-2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -991,11 +991,11 @@ roff_node_alloc(struct roff_man *man, int line, int pos,
        n->sec = man->lastsec;
 
        if (man->flags & MDOC_SYNOPSIS)
-               n->flags |= MDOC_SYNPRETTY;
+               n->flags |= NODE_SYNPRETTY;
        else
-               n->flags &= ~MDOC_SYNPRETTY;
+               n->flags &= ~NODE_SYNPRETTY;
        if (man->flags & MDOC_NEWLINE)
-               n->flags |= MDOC_LINE;
+               n->flags |= NODE_LINE;
        man->flags &= ~MDOC_NEWLINE;
 
        return n;
@@ -1017,14 +1017,17 @@ roff_node_append(struct roff_man *man, struct roff_node *n)
                n->parent = man->last->parent;
                break;
        case ROFF_NEXT_CHILD:
+               if (man->last->child != NULL) {
+                       n->next = man->last->child;
+                       man->last->child->prev = n;
+               } else
+                       man->last->last = n;
                man->last->child = n;
                n->parent = man->last;
-               n->parent->last = n;
                break;
        default:
                abort();
        }
-       n->parent->nchild++;
        man->last = n;
 
        switch (n->type) {
@@ -1060,10 +1063,7 @@ roff_word_alloc(struct roff_man *man, int line, int pos, const char *word)
        n = roff_node_alloc(man, line, pos, ROFFT_TEXT, TOKEN_NONE);
        n->string = roff_strdup(man->roff, word);
        roff_node_append(man, n);
-       if (man->macroset == MACROSET_MDOC)
-               n->flags |= MDOC_VALID | MDOC_ENDED;
-       else
-               n->flags |= MAN_VALID;
+       n->flags |= NODE_VALID | NODE_ENDED;
        man->next = ROFF_NEXT_SIBLING;
 }
 
@@ -1133,7 +1133,7 @@ roff_addeqn(struct roff_man *man, const struct eqn *eqn)
        n = roff_node_alloc(man, eqn->ln, eqn->pos, ROFFT_EQN, TOKEN_NONE);
        n->eqn = eqn;
        if (eqn->ln > man->last->line)
-               n->flags |= MDOC_LINE;
+               n->flags |= NODE_LINE;
        roff_node_append(man, n);
        man->next = ROFF_NEXT_SIBLING;
 }
@@ -1148,10 +1148,7 @@ roff_addtbl(struct roff_man *man, const struct tbl_span *tbl)
        n = roff_node_alloc(man, tbl->line, 0, ROFFT_TBL, TOKEN_NONE);
        n->span = tbl;
        roff_node_append(man, n);
-       if (man->macroset == MACROSET_MDOC)
-               n->flags |= MDOC_VALID | MDOC_ENDED;
-       else
-               n->flags |= MAN_VALID;
+       n->flags |= NODE_VALID | NODE_ENDED;
        man->next = ROFF_NEXT_SIBLING;
 }
 
@@ -1169,7 +1166,6 @@ roff_node_unlink(struct roff_man *man, struct roff_node *n)
        /* Adjust parent. */
 
        if (n->parent != NULL) {
-               n->parent->nchild--;
                if (n->parent->child == n)
                        n->parent->child = n->next;
                if (n->parent->last == n)
@@ -1211,7 +1207,6 @@ roff_node_delete(struct roff_man *man, struct roff_node *n)
 
        while (n->child != NULL)
                roff_node_delete(man, n->child);
-       assert(n->nchild == 0);
        roff_node_unlink(man, n);
        roff_node_free(n);
 }
@@ -1228,22 +1223,25 @@ deroff(char **dest, const struct roff_node *n)
                return;
        }
 
-       /* Skip leading whitespace and escape sequences. */
+       /* Skip leading whitespace. */
 
-       cp = n->string;
-       while (*cp != '\0') {
-               if ('\\' == *cp) {
+       for (cp = n->string; *cp != '\0'; cp++) {
+               if (cp[0] == '\\' && cp[1] != '\0' &&
+                   strchr(" %&0^|~", cp[1]) != NULL)
                        cp++;
-                       mandoc_escape((const char **)&cp, NULL, NULL);
-               } else if (isspace((unsigned char)*cp))
-                       cp++;
-               else
+               else if ( ! isspace((unsigned char)*cp))
                        break;
        }
 
+       /* Skip trailing backslash. */
+
+       sz = strlen(cp);
+       if (sz > 0 && cp[sz - 1] == '\\')
+               sz--;
+
        /* Skip trailing whitespace. */
 
-       for (sz = strlen(cp); sz; sz--)
+       for (; sz; sz--)
                if ( ! isspace((unsigned char)cp[sz-1]))
                        break;
 
@@ -1610,7 +1608,7 @@ roff_parseln(struct roff *r, int ln, struct buf *buf, int *offs)
                        return ROFF_IGN;
                while (buf->buf[pos] != '\0' && buf->buf[pos] != ' ')
                        pos++;
-               while (buf->buf[pos] != '\0' && buf->buf[pos] == ' ')
+               while (buf->buf[pos] == ' ')
                        pos++;
                return tbl_read(r->tbl, ln, buf->buf, pos);
        }
@@ -3040,7 +3038,7 @@ roff_userdef(ROFF_ARGS)
 {
        const char       *arg[9], *ap;
        char             *cp, *n1, *n2;
-       int               i, ib, ie;
+       int               expand_count, i, ib, ie;
        size_t            asz, rsz;
 
        /*
@@ -3064,8 +3062,9 @@ roff_userdef(ROFF_ARGS)
         */
 
        buf->sz = strlen(r->current_string) + 1;
-       n1 = cp = mandoc_malloc(buf->sz);
+       n1 = n2 = cp = mandoc_malloc(buf->sz);
        memcpy(n1, r->current_string, buf->sz);
+       expand_count = 0;
        while (*cp != '\0') {
 
                /* Scan ahead for the next argument invocation. */
@@ -3084,6 +3083,20 @@ roff_userdef(ROFF_ARGS)
                }
                cp -= 2;
 
+               /*
+                * Prevent infinite recursion.
+                */
+
+               if (cp >= n2)
+                       expand_count = 1;
+               else if (++expand_count > EXPAND_LIMIT) {
+                       mandoc_msg(MANDOCERR_ROFFLOOP, r->parse,
+                           ln, (int)(cp - n1), NULL);
+                       free(buf->buf);
+                       buf->buf = n1;
+                       return ROFF_IGN;
+               }
+
                /*
                 * Determine the size of the expanded argument,
                 * taking escaping of quotes into account.
@@ -3367,7 +3380,8 @@ roff_strdup(const struct roff *r, const char *p)
        ssz = 0;
 
        while ('\0' != *p) {
-               if ('\\' != *p && r->xtab && r->xtab[(int)*p].p) {
+               assert((unsigned int)*p < 128);
+               if ('\\' != *p && r->xtab && r->xtab[(unsigned int)*p].p) {
                        sz = r->xtab[(int)*p].sz;
                        res = mandoc_realloc(res, ssz + sz + 1);
                        memcpy(res + ssz, r->xtab[(int)*p].p, sz);