===================================================================
RCS file: /cvs/mandoc/man.c,v
retrieving revision 1.36
retrieving revision 1.38
diff -u -p -r1.36 -r1.38
--- mandoc/man.c	2009/08/21 13:18:32	1.36
+++ mandoc/man.c	2009/08/22 08:56:16	1.38
@@ -1,4 +1,4 @@
-/*	$Id: man.c,v 1.36 2009/08/21 13:18:32 kristaps Exp $ */
+/*	$Id: man.c,v 1.38 2009/08/22 08:56:16 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -378,14 +378,15 @@ man_node_free(struct man_node *p)
 void
 man_node_freelist(struct man_node *p)
 {
+	struct man_node	*n;
 
 	if (p->child)
 		man_node_freelist(p->child);
-	if (p->next)
-		man_node_freelist(p->next);
-
 	assert(0 == p->nchild);
+	n = p->next;
 	man_node_free(p);
+	if (n)
+		man_node_freelist(n);
 }
 
 
@@ -492,6 +493,12 @@ man_pmacro(struct man *m, int ln, char *buf)
 			break;
 		else if (' ' == buf[i])
 			break;
+
+		/* Check for invalid characters. */
+
+		if (isgraph((u_char)buf[i]))
+			continue;
+		return(man_perr(m, ln, i, WNPRINT));
 	}
 
 	mac[j] = 0;
@@ -526,6 +533,7 @@ man_pmacro(struct man *m, int ln, char *buf)
 	if (m->flags & MAN_ELINE) {
 		n = m->last;
 		assert(NULL == n->child);
+		assert(0 == n->nchild);
 		if ( ! man_nwarn(m, n, WLNSCOPE))
 			return(0);
 
@@ -534,10 +542,12 @@ man_pmacro(struct man *m, int ln, char *buf)
 			assert(n == n->prev->next);
 			n->prev->next = NULL;
 			m->last = n->prev;
+			m->next = MAN_NEXT_SIBLING;
 		} else {
 			assert(n == n->parent->child);
 			n->parent->child = NULL;
 			m->last = n->parent;
+			m->next = MAN_NEXT_CHILD;
 		}
 
 		man_node_free(n);