Re: mdocml: Convert an assert into an explicit check.

[Ingo Schwarze <schwarze@usta.de>]

Hi Joerg,

Joerg Sonnenberger wrote on Sun, Nov 20, 2011 at 08:17:18PM +0100:
> On Sun, Nov 20, 2011 at 01:27:10PM +0100, Ingo Schwarze wrote:

>> It's not mandoc(1) that is crashing on that one, but groff(1);

> mandoc(1) was was crashing on this. I gave the complete input file.

Ah, with that bit of information, i was able to reproduce and
finally came round to preparing a proper fix; thanks for the report.
I'm giving a patch against bsd.lv below; in OpenBSD, all that is needed
is removing the "assert(MAN_ROOT != m->last->type);" from function
man_unscope, file man_macro.c.

That function just works fine even when the syntax tree is completely
empty, only containing the ROOT node.  It is important to *NOT*
return early, but to continue through the whole function and execute
the man_valid_post(m) near the end - otherwise, you will end up
with NULL pointers in the meta structure and provoke the crashes
you observed.

OK?
  Ingo


Index: man_html.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/man_html.c,v
retrieving revision 1.84
diff -u -p -r1.84 man_html.c
--- man_html.c	18 Nov 2011 17:05:50 -0000	1.84
+++ man_html.c	3 Dec 2011 21:37:58 -0000
@@ -305,8 +305,7 @@ man_root_pre(MAN_ARGS)
 	if (m->vol)
 		(void)strlcat(b, m->vol, BUFSIZ);
 
-	snprintf(title, BUFSIZ - 1, "%s(%s)", m->title ? m->title : "",
-	    m->msec ? m->msec : "");
+	snprintf(title, BUFSIZ - 1, "%s(%s)", m->title, m->msec);
 
 	PAIR_SUMMARY_INIT(&tag[0], "Document Header");
 	PAIR_CLASS_INIT(&tag[1], "head");
@@ -360,8 +359,7 @@ man_root_post(MAN_ARGS)
 	PAIR_CLASS_INIT(&tag[0], "foot-date");
 	print_otag(h, TAG_TD, 1, tag);
 
-	if (m->date)
-		print_text(h, m->date);
+	print_text(h, m->date);
 	print_stagq(h, tt);
 
 	PAIR_CLASS_INIT(&tag[0], "foot-os");
Index: man_macro.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/man_macro.c,v
retrieving revision 1.69
diff -u -p -r1.69 man_macro.c
--- man_macro.c	18 Nov 2011 17:06:19 -0000	1.69
+++ man_macro.c	3 Dec 2011 21:37:58 -0000
@@ -120,8 +120,6 @@ man_unscope(struct man *m, const struct 
 
 	assert(to);
 
-	if (MAN_ROOT == m->last->type)
-		return(1);
 	m->next = MAN_NEXT_SIBLING;
 
 	/* LINTED */
Index: man_term.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/man_term.c,v
retrieving revision 1.124
diff -u -p -r1.124 man_term.c
--- man_term.c	18 Nov 2011 17:04:06 -0000	1.124
+++ man_term.c	3 Dec 2011 21:37:58 -0000
@@ -969,9 +969,8 @@ print_man_foot(struct termp *p, const vo
 	term_vspace(p);
 	term_vspace(p);
 	term_vspace(p);
-	snprintf(title, BUFSIZ, "%s(%s)", meta->title ? meta->title : "",
-	    meta->msec ? meta->msec : "");
-	datelen = term_strlen(p, meta->date ? meta->date : "");
+	snprintf(title, BUFSIZ, "%s(%s)", meta->title, meta->msec);
+	datelen = term_strlen(p, meta->date);
 
 	p->flags |= TERMP_NOSPACE | TERMP_NOBREAK;
 	p->offset = 0;
@@ -987,7 +986,7 @@ print_man_foot(struct termp *p, const vo
 	if (p->offset + datelen >= p->rmargin)
 		p->rmargin = p->offset + datelen;
 
-	term_word(p, meta->date ? meta->date : "");
+	term_word(p, meta->date);
 	term_flushln(p);
 
 	p->flags &= ~TERMP_NOBREAK;
@@ -1024,8 +1023,7 @@ print_man_head(struct termp *p, const vo
 		strlcpy(buf, m->vol, BUFSIZ);
 	buflen = term_strlen(p, buf);
 
-	snprintf(title, BUFSIZ, "%s(%s)", m->title ? m->title : "",
-	    m->msec ? m->msec : "");
+	snprintf(title, BUFSIZ, "%s(%s)", m->title, m->msec);
 	titlen = term_strlen(p, title);
 
 	p->flags |= TERMP_NOBREAK | TERMP_NOSPACE;
--
 To unsubscribe send an email to tech+unsubscribe@mdocml.bsd.lv