mdocml: When a full block macro gets closed out by a mismatching block

mdocml: When a full block macro gets closed out by a mismatching block

[schwarze]

Log Message:
-----------
When a full block macro gets closed out by a mismatching 
block closure macro it calls, do not attempt to open its body.  
This can for example happen for (nonsensical) constructions like
.Fo
.Nm Fc
in the SYNOPSIS.  Fixing an assertion failure jsg@ found with afl
some time ago (test case number 731).

Modified Files:
--------------
    mdocml:
        mdoc_macro.c

Revision Data
-------------
Index: mdoc_macro.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/mdoc_macro.c,v
retrieving revision 1.164
retrieving revision 1.165
diff -Lmdoc_macro.c -Lmdoc_macro.c -u -p -r1.164 -r1.165
--- mdoc_macro.c
+++ mdoc_macro.c
@@ -1077,8 +1077,9 @@ blk_full(MACRO_PROT_ARGS)
 {
 	int		  la, nl, parsed;
 	struct mdoc_arg	 *arg;
-	struct mdoc_node *head; /* save of head macro */
-	struct mdoc_node *body; /* save of body macro */
+	struct mdoc_node *blk; /* Our own block. */
+	struct mdoc_node *head; /* Our own head. */
+	struct mdoc_node *body; /* Our own body. */
 	struct mdoc_node *n;
 	enum margserr	  ac, lac;
 	char		 *p;
@@ -1118,7 +1119,7 @@ blk_full(MACRO_PROT_ARGS)
 	 */
 
 	mdoc_argv(mdoc, line, tok, &arg, pos, buf);
-	mdoc_block_alloc(mdoc, line, ppos, tok, arg);
+	blk = mdoc_block_alloc(mdoc, line, ppos, tok, arg);
 	head = body = NULL;
 
 	/*
@@ -1218,6 +1219,8 @@ blk_full(MACRO_PROT_ARGS)
 			break;
 	}
 
+	if (blk->flags & MDOC_VALID)
+		return;
 	if (head == NULL)
 		head = mdoc_head_alloc(mdoc, line, ppos, tok);
 	if (nl)
--
 To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv