From: "Kristoffer Haugsbakk" <code@khaugsbakk.name>
To: "Junio C Hamano" <gitster@pobox.com>
Cc: "Tiago Pascoal" <tiago@pascoal.net>,
"git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: git column fails (or crashes) if padding is negative
Date: Sun, 11 Feb 2024 18:08:10 +0100 [thread overview]
Message-ID: <3380df68-83fb-417b-a490-71614edc342f@app.fastmail.com> (raw)
In-Reply-To: <xmqqttmhfrko.fsf@gitster.g>
On Fri, Feb 9, 2024, at 18:57, Junio C Hamano wrote:
> builtin/column.c | 2 ++
> column.c | 4 ++--
> 2 files changed, 4 insertions(+), 2 deletions(-)
>
> […]
> diff --git c/column.c w/column.c
> index ff2f0abf39..9cc703832a 100644
> --- c/column.c
> +++ w/column.c
> @@ -189,7 +189,7 @@ void print_columns(const struct string_list *list,
> unsigned int colopts,
> memset(&nopts, 0, sizeof(nopts));
> nopts.indent = opts && opts->indent ? opts->indent : "";
> nopts.nl = opts && opts->nl ? opts->nl : "\n";
> - nopts.padding = opts ? opts->padding : 1;
> + nopts.padding = (opts && 0 < opts->padding) ? opts->padding : 1;
If these two are meant to check the same condition as in
`builtin/column.c`, shouldn’t it be `0 <= opts->padding`?
> nopts.width = opts && opts->width ? opts->width : term_columns() - 1;
> if (!column_active(colopts)) {
> display_plain(list, "", "\n");
> @@ -373,7 +373,7 @@ int run_column_filter(int colopts, const struct
> column_options *opts)
> strvec_pushf(argv, "--width=%d", opts->width);
> if (opts && opts->indent)
> strvec_pushf(argv, "--indent=%s", opts->indent);
> - if (opts && opts->padding)
> + if (opts && 0 < opts->padding)
> strvec_pushf(argv, "--padding=%d", opts->padding);
>
> fflush(stdout);
--
Kristoffer Haugsbakk
next prev parent reply other threads:[~2024-02-11 17:08 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-09 14:21 git column fails (or crashes) if padding is negative Tiago Pascoal
2024-02-09 16:27 ` Kristoffer Haugsbakk
2024-02-09 17:57 ` Junio C Hamano
2024-02-11 17:08 ` Kristoffer Haugsbakk [this message]
2024-02-12 16:37 ` Junio C Hamano
2024-02-09 17:52 ` [PATCH] column: disallow negative padding Kristoffer Haugsbakk
2024-02-09 18:26 ` Kristoffer Haugsbakk
2024-02-10 9:48 ` Chris Torek
2024-02-11 17:10 ` Kristoffer Haugsbakk
2024-02-11 17:55 ` Junio C Hamano
2024-02-11 18:18 ` Kristoffer Haugsbakk
2024-02-11 19:27 ` [PATCH v2] " Kristoffer Haugsbakk
2024-02-11 22:47 ` Rubén Justo
2024-02-11 23:50 ` Rubén Justo
2024-02-12 7:05 ` Kristoffer Haugsbakk
2024-02-12 16:50 ` Kristoffer Haugsbakk
2024-02-12 21:28 ` Rubén Justo
2024-02-13 16:01 ` [PATCH v3 0/2] " Kristoffer Haugsbakk
2024-02-13 16:01 ` [PATCH v3 1/2] " Kristoffer Haugsbakk
2024-02-13 16:01 ` [PATCH v3 2/2] column: guard against " Kristoffer Haugsbakk
2024-02-13 17:06 ` Junio C Hamano
2024-02-13 18:39 ` Rubén Justo
2024-02-13 19:39 ` Junio C Hamano
2024-02-13 19:56 ` Rubén Justo
2024-02-13 20:35 ` Kristoffer Haugsbakk
2024-02-13 20:59 ` Junio C Hamano
2024-02-13 23:25 ` Rubén Justo
2024-02-13 23:36 ` [PATCH] tag: error when git-column fails Rubén Justo
2024-02-14 1:35 ` Junio C Hamano
2024-02-13 19:27 ` [PATCH v3 0/2] column: disallow negative padding Rubén Justo
2024-02-13 20:32 ` Kristoffer Haugsbakk
2024-02-13 20:58 ` Junio C Hamano
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=3380df68-83fb-417b-a490-71614edc342f@app.fastmail.com \
--to=code@khaugsbakk.name \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=tiago@pascoal.net \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).