From 923f10c1dbf6234d1a2ab1a268fe7b81a3841198 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Tue, 20 Sep 2011 14:20:48 +0000 Subject: [PATCH] Using user-defined macros, surprisingly, it is possible to have *next*-line head arguments on the *same* input line. So .TP must not assume that a head argument with a matching input line number is a same-line argument (and access a NULL pointer). Bug found and fix tested by kristaps@ with groff_hdtbl(7). --- TODO | 6 +++++- man_term.c | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/TODO b/TODO index c0f87fb0..231db2ed 100644 --- a/TODO +++ b/TODO @@ -1,6 +1,6 @@ ************************************************************************ * Official mandoc TODO. -* $Id: TODO,v 1.121 2011/09/18 16:43:28 schwarze Exp $ +* $Id: TODO,v 1.122 2011/09/20 14:20:48 schwarze Exp $ ************************************************************************ ************************************************************************ @@ -350,6 +350,10 @@ Several areas can be cleaned up to make mandoc even faster. These are * structural issues ************************************************************************ +- We use the input line number at several places to distinguish + same-line from different-line input. That plainly doesn't work + with user-defined macros, leading to random breakage. + - Find better ways to prevent endless loops in roff(7) macro and string expansion. diff --git a/man_term.c b/man_term.c index d844df31..211f5f69 100644 --- a/man_term.c +++ b/man_term.c @@ -1,4 +1,4 @@ -/* $Id: man_term.c,v 1.119 2011/09/20 13:13:23 schwarze Exp $ */ +/* $Id: man_term.c,v 1.120 2011/09/20 14:20:48 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2010, 2011 Ingo Schwarze @@ -640,7 +640,7 @@ pre_TP(DECL_ARGS) /* Calculate offset. */ if (NULL != (nn = n->parent->head->child)) - if (nn->parent->line == nn->line) + if (nn->string && nn->parent->line == nn->line) if ((ival = a2width(p, nn->string)) >= 0) len = (size_t)ival; -- 2.47.1