aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/mdoc_term.c
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2015-02-11 14:15:12 +0000
committerIngo Schwarze <schwarze@openbsd.org>2015-02-11 14:15:12 +0000
commit69f54c346ec87b3899a95b224628d8df313bbc85 (patch)
tree26ce4299f1e007fb6010a2553465fece16652b5e /mdoc_term.c
parent7f9cb114fd34b6f74fb89f6b29a4bfd2f7cf921d (diff)
downloadmandoc-69f54c346ec87b3899a95b224628d8df313bbc85.tar.gz
mandoc-69f54c346ec87b3899a95b224628d8df313bbc85.tar.zst
mandoc-69f54c346ec87b3899a95b224628d8df313bbc85.zip
do not access a NULL pointer if an .Eo block lacks a tail;
found by jsg@ with afl, test case #16
Diffstat (limited to 'mdoc_term.c')
-rw-r--r--mdoc_term.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/mdoc_term.c b/mdoc_term.c
index 1c37b203..c374c983 100644
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,4 +1,4 @@
-/* $Id: mdoc_term.c,v 1.308 2015/02/05 01:46:56 schwarze Exp $ */
+/* $Id: mdoc_term.c,v 1.309 2015/02/11 14:15:12 schwarze Exp $ */
/*
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -1989,9 +1989,8 @@ termp_eo_pre(DECL_ARGS)
n->child->end != ENDBODY_NOT)
term_word(p, "\\&");
else if (n->end != ENDBODY_NOT ? n->child != NULL :
- n->parent->head->child != NULL &&
- (n->parent->body->child != NULL ||
- n->parent->tail->child != NULL))
+ n->parent->head->child != NULL && (n->child != NULL ||
+ (n->parent->tail != NULL && n->parent->tail->child != NULL)))
p->flags |= TERMP_NOSPACE;
return(1);