===================================================================
RCS file: /cvs/mandoc/roff.c,v
retrieving revision 1.289
retrieving revision 1.291
diff -u -p -r1.289 -r1.291
--- mandoc/roff.c	2017/02/17 03:03:03	1.289
+++ mandoc/roff.c	2017/03/03 13:55:32	1.291
@@ -1,4 +1,4 @@
-/*	$Id: roff.c,v 1.289 2017/02/17 03:03:03 schwarze Exp $ */
+/*	$Id: roff.c,v 1.291 2017/03/03 13:55:32 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -1236,7 +1236,7 @@ deroff(char **dest, const struct roff_node *n)
 	/* Skip trailing backslash. */
 
 	sz = strlen(cp);
-	if (cp[sz - 1] == '\\')
+	if (sz > 0 && cp[sz - 1] == '\\')
 		sz--;
 
 	/* Skip trailing whitespace. */
@@ -1608,7 +1608,7 @@ roff_parseln(struct roff *r, int ln, struct buf *buf, 
 			return ROFF_IGN;
 		while (buf->buf[pos] != '\0' && buf->buf[pos] != ' ')
 			pos++;
-		while (buf->buf[pos] != '\0' && buf->buf[pos] == ' ')
+		while (buf->buf[pos] == ' ')
 			pos++;
 		return tbl_read(r->tbl, ln, buf->buf, pos);
 	}