===================================================================
RCS file: /cvs/mandoc/roff.c,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -p -r1.214 -r1.215
--- mandoc/roff.c	2014/06/29 23:26:00	1.214
+++ mandoc/roff.c	2014/07/01 00:32:29	1.215
@@ -1,4 +1,4 @@
-/*	$Id: roff.c,v 1.214 2014/06/29 23:26:00 schwarze Exp $ */
+/*	$Id: roff.c,v 1.215 2014/07/01 00:32:29 schwarze Exp $ */
 /*
  * Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -2018,10 +2018,12 @@ roff_getname(struct roff *r, char **cpp, int ln, int p
 		}
 		if ('\\' != *cp)
 			continue;
+		namesz = cp - name;
+		if ('{' == cp[1] || '}' == cp[1])
+			break;
 		cp++;
 		if ('\\' == *cp)
 			continue;
-		namesz = cp - name - 1;
 		mandoc_msg(MANDOCERR_NAMESC, r->parse, ln, pos, NULL);
 		mandoc_escape((const char **)&cp, NULL, NULL);
 		break;