From: Ingo Schwarze <schwarze@usta.de>
To: Michael Stapelberg <stapelberg@debian.org>
Cc: discuss@mandoc.bsd.lv
Subject: Re: mandoc-1.14.5 released
Date: Sat, 1 Jun 2019 21:16:56 +0200 [thread overview]
Message-ID: <20190601191656.GC50352@athene.usta.de> (raw)
In-Reply-To: <CANnVG6=366beZikUjz+EdK3O1AoxW4r2xsL1MiapduPopJd-Gw@mail.gmail.com>
Hi Michael,
thanks again for reporting.
Michael Stapelberg wrote on Mon, May 27, 2019 at 08:34:21AM +0200:
> I have encountered one more issue:
>
> % curl -s
> https://manpages.debian.org/testing/mysql-server-5.6/mysqlbinlog.1.en.gz |
> ./mandoc -Thtml
> […]
> free(): invalid pointer
>
> Could you take a look at that, too, please?
I believe that problem was already fixed with this commit:
2019-03-29 21:27 schwarze
Changed:
out.c (1.78), "Exp", lines: +2 -2
Set the maximum column index in a tbl(7) to the maximum *right*
edge of any cell span, not to the maximum *left* edge, which may be
smaller if the last column of the table is only reached by
horizontal spans, but not by any regular cell in any row of the
table. Otherwise, the algorithm calculating column widths accessed
memomy after the end of the colwidth[] array, while it was trying
to handle the rightmost column(s).
Crash reported by Jason Thorpe <thorpej at NetBSD> via
https://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=54069
and via Thomas Klausner (wiz@). Christos@ Zoulas sent a (correct,
but slightly confusing) patch. The patch i'm committing here is
easier to understand.
Could you please cross-check whether that patch (appended below)
resolves the problem for you?
Thanks,
Ingo
Index: out.c
===================================================================
RCS file: /home/cvs/mandoc/mandoc/out.c,v
retrieving revision 1.77
diff -u -p -r1.77 out.c
--- out.c 13 Dec 2018 11:55:47 -0000 1.77
+++ out.c 1 Jun 2019 19:14:23 -0000
@@ -1,4 +1,4 @@
-/* $Id: out.c,v 1.77 2018/12/13 11:55:47 schwarze Exp $ */
+/* $Id: out.c,v 1.78 2019/03/29 21:27:06 schwarze Exp $ */
/*
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2011,2014,2015,2017,2018 Ingo Schwarze <schwarze@openbsd.org>
@@ -149,7 +149,7 @@ tblcalc(struct rofftbl *tbl, const struc
gp = &first_group;
for (dp = sp->first; dp != NULL; dp = dp->next) {
icol = dp->layout->col;
- while (icol > maxcol)
+ while (maxcol < icol + dp->hspans)
tbl->cols[++maxcol].spacing = SIZE_MAX;
col = tbl->cols + icol;
col->flags |= dp->layout->flags;
--
To unsubscribe send an email to discuss+unsubscribe@mandoc.bsd.lv
next prev parent reply other threads:[~2019-06-01 19:17 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-10 11:32 Ingo Schwarze
2019-04-28 13:24 ` Michael Stapelberg
2019-04-30 16:08 ` Ingo Schwarze
2019-05-25 15:22 ` Michael Stapelberg
2019-05-27 6:34 ` Michael Stapelberg
2019-06-01 19:16 ` Ingo Schwarze [this message]
2019-06-03 17:01 ` Michael Stapelberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190601191656.GC50352@athene.usta.de \
--to=schwarze@usta.de \
--cc=discuss@mandoc.bsd.lv \
--cc=stapelberg@debian.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).