===================================================================
RCS file: /cvs/mandoc/tbl_data.c,v
retrieving revision 1.20
retrieving revision 1.23
diff -u -p -r1.20 -r1.23
--- mandoc/tbl_data.c	2011/01/25 12:16:22	1.20
+++ mandoc/tbl_data.c	2011/03/15 16:23:51	1.23
@@ -1,4 +1,4 @@
-/*	$Id: tbl_data.c,v 1.20 2011/01/25 12:16:22 schwarze Exp $ */
+/*	$Id: tbl_data.c,v 1.23 2011/03/15 16:23:51 kristaps Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -29,11 +29,11 @@
 #include "libmandoc.h"
 #include "libroff.h"
 
-static	int	data(struct tbl_node *, struct tbl_span *, 
-			int, const char *, int *);
-static	struct tbl_span	*newspan(struct tbl_node *, struct tbl_row *);
+static	int		 data(struct tbl_node *, struct tbl_span *, 
+				int, const char *, int *);
+static	struct tbl_span	*newspan(struct tbl_node *, int, 
+				struct tbl_row *);
 
-
 static int
 data(struct tbl_node *tbl, struct tbl_span *dp, 
 		int ln, const char *p, int *pos)
@@ -106,8 +106,10 @@ data(struct tbl_node *tbl, struct tbl_span *dp, 
 		return(0);
 	}
 
-	dat->string = mandoc_malloc(*pos - sv + 1);
-	memcpy(dat->string, &p[sv], *pos - sv);
+	assert(*pos - sv >= 0);
+
+	dat->string = mandoc_malloc((size_t)(*pos - sv + 1));
+	memcpy(dat->string, &p[sv], (size_t)(*pos - sv));
 	dat->string[*pos - sv] = '\0';
 
 	if (p[*pos])
@@ -176,11 +178,12 @@ tbl_cdata(struct tbl_node *tbl, int ln, const char *p)
 }
 
 static struct tbl_span *
-newspan(struct tbl_node *tbl, struct tbl_row *rp)
+newspan(struct tbl_node *tbl, int line, struct tbl_row *rp)
 {
 	struct tbl_span	*dp;
 
 	dp = mandoc_calloc(1, sizeof(struct tbl_span));
+	dp->line = line;
 	dp->tbl = &tbl->opts;
 	dp->layout = rp;
 	dp->head = tbl->first_head;
@@ -190,6 +193,7 @@ newspan(struct tbl_node *tbl, struct tbl_row *rp)
 		tbl->last_span = dp;
 	} else {
 		tbl->last_span = tbl->first_span = dp;
+		tbl->current_span = NULL;
 		dp->flags |= TBL_SPAN_FIRST;
 	}
 
@@ -225,11 +229,11 @@ tbl_data(struct tbl_node *tbl, int ln, const char *p)
 					rp && rp->first; rp = rp->next) {
 				switch (rp->first->pos) {
 				case (TBL_CELL_HORIZ):
-					dp = newspan(tbl, rp);
+					dp = newspan(tbl, ln, rp);
 					dp->pos = TBL_SPAN_HORIZ;
 					continue;
 				case (TBL_CELL_DHORIZ):
-					dp = newspan(tbl, rp);
+					dp = newspan(tbl, ln, rp);
 					dp->pos = TBL_SPAN_DHORIZ;
 					continue;
 				default:
@@ -247,7 +251,7 @@ tbl_data(struct tbl_node *tbl, int ln, const char *p)
 
 	assert(rp);
 
-	dp = newspan(tbl, rp);
+	dp = newspan(tbl, ln, rp);
 
 	if ( ! strcmp(p, "_")) {
 		dp->pos = TBL_SPAN_HORIZ;