From: "Martin Ågren" <martin.agren@gmail.com>
To: Rafael Silva <rafaeloliveira.cs@gmail.com>
Cc: "Git Mailing List" <git@vger.kernel.org>,
"Derrick Stolee" <dstolee@microsoft.com>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
"Jeff King" <peff@peff.net>
Subject: Re: [PATCH 1/1] maintenance: fix a SEGFAULT when no repository
Date: Tue, 24 Nov 2020 20:03:33 +0100 [thread overview]
Message-ID: <CAN0heSpjYEZbjXcX-XSvwwBKOEQ=Dtk=Nnr3T+BOqB+fd7x4sQ@mail.gmail.com> (raw)
In-Reply-To: <20201124164405.29327-2-rafaeloliveira.cs@gmail.com>
On Tue, 24 Nov 2020 at 17:47, Rafael Silva <rafaeloliveira.cs@gmail.com> wrote:
> @@ -1265,9 +1265,14 @@ static int maintenance_run_tasks(struct maintenance_run_opts *opts)
> {
> int i, found_selected = 0;
> int result = 0;
> + char *lock_path;
> struct lock_file lk;
> struct repository *r = the_repository;
> - char *lock_path = xstrfmt("%s/maintenance", r->objects->odb->path);
> +
> + if (!r || !r->gitdir)
> + return error(_("not a git repository"));
> +
> + lock_path = xstrfmt("%s/maintenance", the_repository->objects->odb->path);
s/the_repository/r/
(The preimage uses "r" and you check using "r".)
> @@ -1513,8 +1518,13 @@ static int update_background_schedule(int run_maintenance)
> FILE *cron_list, *cron_in;
> const char *crontab_name;
> struct strbuf line = STRBUF_INIT;
> + char *lock_path;
> struct lock_file lk;
> - char *lock_path = xstrfmt("%s/schedule", the_repository->objects->odb->path);
> +
> + if (!the_repository || !the_repository->gitdir)
> + return error(_("not a git repository"));
> +
> + lock_path = xstrfmt("%s/schedule", the_repository->objects->odb->path);
Here it's "the_repository" both before and after. Ok.
Martin
next prev parent reply other threads:[~2020-11-24 19:03 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-24 16:44 [PATCH 0/1] maintenance: Fix a SEGFAULT when no repository when running git maintenance run/start Rafael Silva
2020-11-24 16:44 ` [PATCH 1/1] maintenance: fix a SEGFAULT when no repository Rafael Silva
2020-11-24 17:22 ` Derrick Stolee
2020-11-24 21:48 ` Junio C Hamano
2020-11-24 21:59 ` Derrick Stolee
2020-11-26 8:22 ` Rafael Silva
2020-11-26 11:21 ` Derrick Stolee
2020-11-24 17:24 ` Eric Sunshine
2020-11-24 19:14 ` SZEDER Gábor
2020-11-24 19:34 ` Eric Sunshine
2020-11-26 7:13 ` Rafael Silva
2020-11-24 19:03 ` Martin Ågren [this message]
2020-11-26 7:07 ` Rafael Silva
2020-11-26 20:41 ` [PATCH v2 0/1] maintenance: Fix SEGFAULT when running outside of a repository Rafael Silva
2020-11-26 20:41 ` [PATCH v2 1/1] maintenance: fix SEGFAULT when no repository Rafael Silva
2020-11-27 20:43 ` Derrick Stolee
2020-12-08 20:12 ` Josh Steadmon
2020-12-08 21:58 ` Junio C Hamano
2020-12-08 22:17 ` Junio C Hamano
2020-12-24 8:12 ` Christian Couder
2020-12-24 14:14 ` Junio C Hamano
2020-12-09 9:29 ` Rafael Silva
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='CAN0heSpjYEZbjXcX-XSvwwBKOEQ=Dtk=Nnr3T+BOqB+fd7x4sQ@mail.gmail.com' \
--to=martin.agren@gmail.com \
--cc=dstolee@microsoft.com \
--cc=git@vger.kernel.org \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
--cc=rafaeloliveira.cs@gmail.com \
/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).