===================================================================
RCS file: /cvs/mandoc/mandoc.c,v
retrieving revision 1.50
retrieving revision 1.52
diff -u -p -r1.50 -r1.52
--- mandoc/mandoc.c	2011/05/14 16:06:09	1.50
+++ mandoc/mandoc.c	2011/05/15 15:30:33	1.52
@@ -1,4 +1,4 @@
-/*	$Id: mandoc.c,v 1.50 2011/05/14 16:06:09 kristaps Exp $ */
+/*	$Id: mandoc.c,v 1.52 2011/05/15 15:30:33 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -125,6 +125,14 @@ mandoc_escape(const char **end, const char **start, in
 		break;
 	case ('['):
 		gly = ESCAPE_SPECIAL;
+		/*
+		 * Unicode escapes are defined in groff as \[uXXXX] to
+		 * \[u10FFFF], where the contained value must be a valid
+		 * Unicode codepoint.  Here, however, only check whether
+		 * it's not a zero-width escape.
+		 */
+		if ('u' == cp[i] && ']' != cp[i + 1])
+			gly = ESCAPE_UNICODE;
 		term = ']';
 		break;
 	case ('C'):
@@ -704,7 +712,7 @@ mandoc_strntou(const char *p, size_t sz, int base)
 		return(-1);
 
 	memcpy(buf, p, sz);
-	buf[sz] = '\0';
+	buf[(int)sz] = '\0';
 
 	errno = 0;
 	v = strtol(buf, &ep, base);