From 6e010d1175e0b79d1ce84b3d4fed64b2f489ef0f Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Sat, 9 Feb 2019 16:00:39 +0000 Subject: ignore empty request lines in the table data reader; fixing a minibug reported by bentley@ --- tbl_data.c | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/tbl_data.c b/tbl_data.c index ecdf50a0..9a58d325 100644 --- a/tbl_data.c +++ b/tbl_data.c @@ -1,7 +1,7 @@ -/* $Id: tbl_data.c,v 1.51 2018/12/14 05:18:03 schwarze Exp $ */ +/* $Id: tbl_data.c,v 1.52 2019/02/09 16:00:39 schwarze Exp $ */ /* * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons - * Copyright (c) 2011, 2015, 2017, 2018 Ingo Schwarze + * Copyright (c) 2011,2015,2017,2018,2019 Ingo Schwarze * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -248,14 +248,27 @@ tbl_data(struct tbl_node *tbl, int ln, const char *p, int pos) assert(rp != NULL); - if ( ! strcmp(p, "_")) { - sp = newspan(tbl, ln, rp); - sp->pos = TBL_SPAN_HORIZ; - return; - } else if ( ! strcmp(p, "=")) { - sp = newspan(tbl, ln, rp); - sp->pos = TBL_SPAN_DHORIZ; - return; + if (p[1] == '\0') { + switch (p[0]) { + case '.': + /* + * Empty request lines must be handled here + * and cannot be discarded in roff_parseln() + * because in the layout section, they + * are significant and end the layout. + */ + return; + case '_': + sp = newspan(tbl, ln, rp); + sp->pos = TBL_SPAN_HORIZ; + return; + case '=': + sp = newspan(tbl, ln, rp); + sp->pos = TBL_SPAN_DHORIZ; + return; + default: + break; + } } /* -- cgit v1.2.3-56-ge451