Avoid out-of-bounds read access before the beginning of the

[mandoc.git] / mdoc_html.c

diff --git a/mdoc_html.c b/mdoc_html.c
index f785e8f40647e66e83f8886e27a62d2f325904ac..85be95b668b32f7e6ecbb91d2a83676419fe62ab 100644 (file)
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_html.c,v 1.229 2015/04/02 23:48:20 schwarze Exp $ */
+/*     $Id: mdoc_html.c,v 1.232 2015/04/18 17:53:21 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -48,7 +48,6 @@ struct        htmlmdoc {
        void            (*post)(MDOC_ARGS);
 };
 
-static void              print_mdoc(MDOC_ARGS);
 static void              print_mdoc_head(MDOC_ARGS);
 static void              print_mdoc_node(MDOC_ARGS);
 static void              print_mdoc_nodelist(MDOC_ARGS);
@@ -264,15 +263,6 @@ static     const char * const lists[LIST_MAX] = {
 };
 
 
-void
-html_mdoc(void *arg, const struct mdoc *mdoc)
-{
-
-       print_mdoc(mdoc_meta(mdoc), mdoc_node(mdoc)->child,
-           (struct html *)arg);
-       putchar('\n');
-}
-
 /*
  * Calculate the scaling unit passed in a `-width' argument.  This uses
  * either a native scaling unit (e.g., 1i, 2m) or the string length of
@@ -331,27 +321,32 @@ synopsis_pre(struct html *h, const struct roff_node *n)
        }
 }
 
-static void
-print_mdoc(MDOC_ARGS)
+void
+html_mdoc(void *arg, const struct roff_man *mdoc)
 {
-       struct tag      *t, *tt;
        struct htmlpair  tag;
+       struct html     *h;
+       struct tag      *t, *tt;
 
        PAIR_CLASS_INIT(&tag, "mandoc");
+       h = (struct html *)arg;
 
        if ( ! (HTML_FRAGMENT & h->oflags)) {
                print_gen_decls(h);
                t = print_otag(h, TAG_HTML, 0, NULL);
                tt = print_otag(h, TAG_HEAD, 0, NULL);
-               print_mdoc_head(meta, n, h);
+               print_mdoc_head(&mdoc->meta, mdoc->first->child, h);
                print_tagq(h, tt);
                print_otag(h, TAG_BODY, 0, NULL);
                print_otag(h, TAG_DIV, 1, &tag);
        } else
                t = print_otag(h, TAG_DIV, 1, &tag);
 
-       print_mdoc_nodelist(meta, n, h);
+       mdoc_root_pre(&mdoc->meta, mdoc->first->child, h);
+       print_mdoc_nodelist(&mdoc->meta, mdoc->first->child, h);
+       mdoc_root_post(&mdoc->meta, mdoc->first->child, h);
        print_tagq(h, t);
+       putchar('\n');
 }
 
 static void
@@ -391,9 +386,6 @@ print_mdoc_node(MDOC_ARGS)
        n->flags &= ~MDOC_ENDED;
 
        switch (n->type) {
-       case ROFFT_ROOT:
-               child = mdoc_root_pre(meta, n, h);
-               break;
        case ROFFT_TEXT:
                /* No tables in this mode... */
                assert(NULL == h->tblt);
@@ -451,9 +443,6 @@ print_mdoc_node(MDOC_ARGS)
        print_stagq(h, t);
 
        switch (n->type) {
-       case ROFFT_ROOT:
-               mdoc_root_post(meta, n, h);
-               break;
        case ROFFT_EQN:
                break;
        default: