===================================================================
RCS file: /cvs/mandoc/roff.c,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -p -r1.241 -r1.242
--- mandoc/roff.c	2014/12/16 01:22:59	1.241
+++ mandoc/roff.c	2014/12/16 03:53:43	1.242
@@ -1,4 +1,4 @@
-/*	$Id: roff.c,v 1.241 2014/12/16 01:22:59 schwarze Exp $ */
+/*	$Id: roff.c,v 1.242 2014/12/16 03:53:43 schwarze Exp $ */
 /*
  * Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -1236,7 +1236,7 @@ roff_evalstrcond(const char *v, int *pos)
 out:
 	if (NULL == s3)
 		s3 = strchr(s2, '\0');
-	else
+	else if (*s3 != '\0')
 		s3++;
 	*pos = s3 - v;
 	return(match);