From: Andrey Okoshkin <a.okoshkin@samsung.com>
To: Jeff King <peff@peff.net>, gitster@pobox.com
Cc: git@vger.kernel.org, Ivan Arishchenko <i.arishchenk@samsung.com>,
Mikhail Labiuk <m.labiuk@samsung.com>
Subject: [PATCH v3] commit: check result of resolve_ref_unsafe
Date: Fri, 20 Oct 2017 14:03:28 +0300 [thread overview]
Message-ID: <c5f72436-df4e-5c51-d58b-8699dfcfd70c@samsung.com> (raw)
In-Reply-To: <20171019174452.hd3c47ocducddvgr@sigill.intra.peff.net>
Add check of the resolved HEAD reference while printing of a commit summary.
resolve_ref_unsafe() may return NULL pointer if underlying calls of lstat() or
open() fail in files_read_raw_ref().
Such situation can be caused by race: file becomes inaccessible to this moment.
Signed-off-by: Andrey Okoshkin <a.okoshkin@samsung.com>
---
die_errno fits better here as resolve_ref_unsafe preserves errno value.
Changes since the previous patch:
* die is replaced with die_errno.
builtin/commit.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/builtin/commit.c b/builtin/commit.c
index 1a0da71a4..b52829090 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1483,6 +1483,8 @@ static void print_summary(const char *prefix, const struct object_id *oid,
diff_setup_done(&rev.diffopt);
head = resolve_ref_unsafe("HEAD", 0, junk_oid.hash, NULL);
+ if (!head)
+ die_errno(_("unable to resolve HEAD after creating commit"));
if (!strcmp(head, "HEAD"))
head = _("detached HEAD");
else
--
2.14.2
next prev parent reply other threads:[~2017-10-20 11:03 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20171018170047epcas2p4310be357e11e194d6d08ac3bdc478ba3@epcas2p4.samsung.com>
2017-10-18 17:00 ` [PATCH] commit: check result of resolve_ref_unsafe Andrey Okoshkin
2017-10-18 18:34 ` Jeff King
2017-10-19 0:41 ` Junio C Hamano
2017-10-19 2:49 ` Jeff King
2017-10-19 9:33 ` Andrey Okoshkin
2017-10-19 9:36 ` [PATCH v2] " Andrey Okoshkin
2017-10-19 17:44 ` Jeff King
2017-10-19 17:46 ` [PATCH 1/4] test-ref-store: avoid passing NULL to printf Jeff King
2017-10-19 17:47 ` [PATCH 2/4] remote: handle broken symrefs Jeff King
2017-10-19 17:53 ` Jeff King
2017-10-19 17:49 ` [PATCH 3/4] log: handle broken HEAD in decoration check Jeff King
2017-10-19 17:49 ` [PATCH 4/4] worktree: handle broken symrefs in find_shared_symref() Jeff King
2017-10-21 10:49 ` Eric Sunshine
2017-10-21 19:26 ` Jeff King
2017-10-22 0:46 ` Junio C Hamano
2017-10-20 10:40 ` [PATCH v2] commit: check result of resolve_ref_unsafe Andrey Okoshkin
2017-10-20 11:03 ` Andrey Okoshkin [this message]
2017-10-20 13:09 ` [PATCH v4] " Andrey Okoshkin
2017-10-21 6:19 ` Jeff King
2017-10-22 0:46 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c5f72436-df4e-5c51-d58b-8699dfcfd70c@samsung.com \
--to=a.okoshkin@samsung.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=i.arishchenk@samsung.com \
--cc=m.labiuk@samsung.com \
--cc=peff@peff.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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).