===================================================================
RCS file: /cvs/texi2mdoc/util.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- texi2mdoc/util.c	2015/03/12 10:44:34	1.32
+++ texi2mdoc/util.c	2015/03/13 08:07:34	1.33
@@ -1,4 +1,4 @@
-/*	$Id: util.c,v 1.32 2015/03/12 10:44:34 kristaps Exp $ */
+/*	$Id: util.c,v 1.33 2015/03/13 08:07:34 kristaps Exp $ */
 /*
  * Copyright (c) 2015 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -582,7 +582,8 @@ advanceeoln(struct texi *p, size_t *pos, int consumenl
 	while (*pos < BUFSZ(p) && '\n' != BUF(p)[*pos]) {
 		if ('@' == BUF(p)[*pos])
 			advance(p, pos);
-		advance(p, pos);
+		if (*pos < BUFSZ(p))
+			advance(p, pos);
 	}
 	if (*pos < BUFSZ(p) && consumenl)
 		advance(p, pos);
@@ -1059,6 +1060,10 @@ parseeoln(struct texi *p, size_t *pos)
 			if (p->literal)
 				texiputchar(p, BUF(p)[*pos]);
 			advance(p, pos);
+		}
+		if (*pos == BUFSZ(p)) {
+			texiwarn(p, "unexpected EOF");
+			return;
 		}
 		switch (BUF(p)[*pos]) {
 		case ('}'):