===================================================================
RCS file: /cvs/mandoc/mandoc.c,v
retrieving revision 1.84
retrieving revision 1.86
diff -u -p -r1.84 -r1.86
--- mandoc/mandoc.c	2014/08/10 23:54:41	1.84
+++ mandoc/mandoc.c	2014/08/18 09:11:47	1.86
@@ -1,4 +1,4 @@
-/*	$Id: mandoc.c,v 1.84 2014/08/10 23:54:41 schwarze Exp $ */
+/*	$Id: mandoc.c,v 1.86 2014/08/18 09:11:47 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -199,7 +199,8 @@ mandoc_escape(const char **end, const char **start, in
 		/* FALLTHROUGH */
 	case 'x':
 		if (strchr(" %&()*+-./0123456789:<=>", **start)) {
-			++*end;
+			if ('\0' != **start)
+				++*end;
 			return(ESCAPE_ERROR);
 		}
 		gly = ESCAPE_IGNORE;
@@ -455,7 +456,7 @@ a2time(time_t *t, const char *fmt, const char *p)
 	memset(&tm, 0, sizeof(struct tm));
 
 	pp = NULL;
-#ifdef	HAVE_STRPTIME
+#if HAVE_STRPTIME
 	pp = strptime(p, fmt, &tm);
 #endif
 	if (NULL != pp && '\0' == *pp) {