From 5e859b1a66b94c8cf3ee617d521d7031687d509c Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Mon, 18 Mar 2019 08:00:34 +0000 Subject: fix a NULL pointer access on empty tbl(7) data cells that bentley@ found in syncthing-bep(7) --- tbl_term.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tbl_term.c b/tbl_term.c index 63e7cc62..380877bd 100644 --- a/tbl_term.c +++ b/tbl_term.c @@ -1,4 +1,4 @@ -/* $Id: tbl_term.c,v 1.69 2019/03/16 21:35:48 schwarze Exp $ */ +/* $Id: tbl_term.c,v 1.70 2019/03/18 08:00:34 schwarze Exp $ */ /* * Copyright (c) 2009, 2011 Kristaps Dzonsons * Copyright (c) 2011-2019 Ingo Schwarze @@ -629,7 +629,8 @@ tbl_hrule(struct termp *tp, const struct tbl_span *spp, lw = cpp == NULL || cpn == NULL || (cpn->pos != TBL_CELL_DOWN && - (dpn == NULL || strcmp(dpn->string, "\\^") != 0)) + (dpn == NULL || dpn->string == NULL || + strcmp(dpn->string, "\\^") != 0)) ? hw : 0; tbl_direct_border(tp, BHORIZ * lw, col->width + col->spacing / 2); @@ -675,7 +676,8 @@ tbl_hrule(struct termp *tp, const struct tbl_span *spp, rw = cpp == NULL || cpn == NULL || (cpn->pos != TBL_CELL_DOWN && - (dpn == NULL || strcmp(dpn->string, "\\^") != 0)) + (dpn == NULL || dpn->string == NULL || + strcmp(dpn->string, "\\^") != 0)) ? hw : 0; /* The line crossing at the end of this column. */ -- cgit v1.2.3