do not crash when a tbl(7) cell uses roman font

[mandoc.git] / demandoc.c

diff --git a/demandoc.c b/demandoc.c
index 8b202ab023a0c2f5f45e9a0ef66ba33c35f68150..57d0cc5f4120dee213091c638803161c87948ea2 100644 (file)
--- a/demandoc.c
+++ b/demandoc.c
@@ -1,4 +1,4 @@
-/*     $Id: demandoc.c,v 1.29 2017/06/24 14:38:32 schwarze Exp $ */
+/*     $Id: demandoc.c,v 1.33 2019/03/03 11:01:15 schwarze Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -29,6 +29,7 @@
 #include "roff.h"
 #include "man.h"
 #include "mdoc.h"
+#include "mandoc_parse.h"
 
 static void     pline(int, int *, int *, int);
 static void     pman(const struct roff_node *, int *, int *, int);
@@ -78,8 +79,8 @@ main(int argc, char *argv[])
        argv += optind;
 
        mchars_alloc();
-       mp = mparse_alloc(MPARSE_SO, MANDOCERR_MAX, NULL,
-           MANDOC_OS_OTHER, NULL);
+       mp = mparse_alloc(MPARSE_SO | MPARSE_UTF8 | MPARSE_LATIN1 |
+           MPARSE_VALIDATE, MANDOC_OS_OTHER, NULL);
        assert(mp);
 
        if (argc < 1)
@@ -109,24 +110,19 @@ usage(void)
 static void
 pmandoc(struct mparse *mp, int fd, const char *fn, int list)
 {
-       struct roff_man *man;
+       struct roff_meta        *meta;
        int              line, col;
 
        mparse_readfd(mp, fd, fn);
        close(fd);
-       mparse_result(mp, &man, NULL);
+       meta = mparse_result(mp);
        line = 1;
        col = 0;
 
-       if (man == NULL)
-               return;
-       if (man->macroset == MACROSET_MDOC) {
-               mdoc_validate(man);
-               pmdoc(man->first->child, &line, &col, list);
-       } else {
-               man_validate(man);
-               pman(man->first->child, &line, &col, list);
-       }
+       if (meta->macroset == MACROSET_MDOC)
+               pmdoc(meta->first->child, &line, &col, list);
+       else
+               pman(meta->first->child, &line, &col, list);
 
        if ( ! list)
                putchar('\n');