aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2019-01-11 16:36:19 +0000
committerIngo Schwarze <schwarze@openbsd.org>2019-01-11 16:36:19 +0000
commit55d8efa26c02803a45390d905d96a964405037d0 (patch)
tree104a52a0b6cf3326ca10b0a3a8c859f0c09c8b24
parentee6f1de3309289a39aa90cae26282fb4774fb08a (diff)
downloadmandoc-55d8efa26c02803a45390d905d96a964405037d0.tar.gz
mandoc-55d8efa26c02803a45390d905d96a964405037d0.tar.zst
mandoc-55d8efa26c02803a45390d905d96a964405037d0.zip
do not access a NULL pointer when formatting a completely empty document
-rw-r--r--man_html.c4
-rw-r--r--mdoc_html.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/man_html.c b/man_html.c
index e11ed0e6..90aad393 100644
--- a/man_html.c
+++ b/man_html.c
@@ -1,4 +1,4 @@
-/* $Id: man_html.c,v 1.168 2019/01/11 12:56:43 schwarze Exp $ */
+/* $Id: man_html.c,v 1.169 2019/01/11 16:36:19 schwarze Exp $ */
/*
* Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2013-2015, 2017-2019 Ingo Schwarze <schwarze@openbsd.org>
@@ -119,7 +119,7 @@ html_man(void *arg, const struct roff_meta *man)
if ((h->oflags & HTML_FRAGMENT) == 0) {
print_gen_decls(h);
print_otag(h, TAG_HTML, "");
- if (n->type == ROFFT_COMMENT)
+ if (n != NULL && n->type == ROFFT_COMMENT)
print_gen_comment(h, n);
t = print_otag(h, TAG_HEAD, "");
print_man_head(man, h);
diff --git a/mdoc_html.c b/mdoc_html.c
index fe62b80a..c7f452ec 100644
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1,7 +1,7 @@
-/* $Id: mdoc_html.c,v 1.325 2019/01/11 12:56:43 schwarze Exp $ */
+/* $Id: mdoc_html.c,v 1.326 2019/01/11 16:36:19 schwarze Exp $ */
/*
* Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2014,2015,2016,2017,2018 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2014-2019 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
@@ -294,7 +294,7 @@ html_mdoc(void *arg, const struct roff_meta *mdoc)
if ((h->oflags & HTML_FRAGMENT) == 0) {
print_gen_decls(h);
print_otag(h, TAG_HTML, "");
- if (n->type == ROFFT_COMMENT)
+ if (n != NULL && n->type == ROFFT_COMMENT)
print_gen_comment(h, n);
t = print_otag(h, TAG_HEAD, "");
print_mdoc_head(mdoc, h);