From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from localhost (fantadrom.bsd.lv [local]) by fantadrom.bsd.lv (OpenSMTPD) with ESMTPA id 3b3c1775 for ; Fri, 3 Mar 2017 10:06:18 -0500 (EST) Date: Fri, 3 Mar 2017 10:06:18 -0500 (EST) Message-Id: <9641224047107722556.enqueue@fantadrom.bsd.lv> X-Mailinglist: mdocml-source Reply-To: source@mdocml.bsd.lv MIME-Version: 1.0 From: schwarze@mdocml.bsd.lv To: source@mdocml.bsd.lv Subject: mdocml: Markdown output mode helped us to find the first parser bug (as X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/ Content-Type: text/plain; charset=utf-8 Log Message: ----------- Markdown output mode helped us to find the first parser bug (as such, this bug could cause wrong output in other modes as well): Do not misinterpret tab characters as .Ta macros when they appear on non-column .It lines in non-column .Bl lists that are nested inside a parent .Bl -column list. (Admittedly, such constructions are not very useful; don't use them!) Found by tb@ with afl(1) because the resulting tree corruption triggered an assertion in the markdown output module. Modified Files: -------------- mdocml: mdoc_argv.c Revision Data ------------- Index: mdoc_argv.c =================================================================== RCS file: /home/cvs/mdocml/mdocml/mdoc_argv.c,v retrieving revision 1.109 retrieving revision 1.110 diff -Lmdoc_argv.c -Lmdoc_argv.c -u -p -r1.109 -r1.110 --- mdoc_argv.c +++ mdoc_argv.c @@ -1,7 +1,7 @@ /* $Id$ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons - * Copyright (c) 2012, 2014, 2015 Ingo Schwarze + * Copyright (c) 2012, 2014-2017 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 @@ -424,8 +424,6 @@ mdoc_args(struct roff_man *mdoc, int lin if (v == NULL) v = &v_local; fl = tok == TOKEN_NONE ? ARGSFL_NONE : mdocargs[tok].flags; - if (tok != MDOC_It) - return args(mdoc, line, pos, buf, fl, v); /* * We know that we're in an `It', so it's reasonable to expect @@ -434,12 +432,15 @@ mdoc_args(struct roff_man *mdoc, int lin * safe fall-back into the default behaviour. */ - for (n = mdoc->last; n; n = n->parent) - if (MDOC_Bl == n->tok) - if (LIST_column == n->norm->Bl.type) { + if (tok == MDOC_It) { + for (n = mdoc->last; n != NULL; n = n->parent) { + if (n->tok != MDOC_Bl) + continue; + if (n->norm->Bl.type == LIST_column) fl = ARGSFL_TABSEP; - break; - } + break; + } + } return args(mdoc, line, pos, buf, fl, v); } -- To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv