From: Gregory David <gregory.david@p1sec.com>
To: git@vger.kernel.org
Cc: ptm-dev <ptm-dev@p1sec.com>
Subject: [PATCH] show-branch: fix SEGFAULT when `--current` and `--reflog` together
Date: Thu, 21 Apr 2022 13:34:03 +0000 [thread overview]
Message-ID: <225b410d-2d98-8c0b-c289-22f753c175d4@p1sec.com> (raw)
[-- Attachment #1.1.1: Type: text/plain, Size: 3552 bytes --]
If run `show-branch` with `--current` and `--reflog` simultaneously, a
SEGFAULT appears.
The bug is that we read over the end of the `reflog_msg` array after
having `append_one_rev()` for the current branch without supplying a
convenient message to it.
It seems that it has been introduced in:
Commit 1aa68d6735 (show-branch: --current includes the current branch.,
2006-01-11)
Signed-off-by: Gregory DAVID <gregory.david@p1sec.com>
Thanks-to: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
builtin/show-branch.c | 22 +++++++++++++++++++--
t/t3202-show-branch.sh | 43 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 63 insertions(+), 2 deletions(-)
diff --git a/builtin/show-branch.c b/builtin/show-branch.c
index e12c5e80e3..c8d830b7c6 100644
--- a/builtin/show-branch.c
+++ b/builtin/show-branch.c
@@ -812,8 +812,26 @@ int cmd_show_branch(int ac, const char **av, const
char *prefix)
}
if (!has_head) {
const char *name = head;
- skip_prefix(name, "refs/heads/", &name);
- append_one_rev(name);
+ struct object_id oid;
+ char *ref;
+ unsigned int flags = 0;
+ char *log_msg = 0;
+ char *end_log_msg;
+ timestamp_t timestamp;
+ int tz;
+
+ if (!dwim_ref(*av, strlen(*av), &oid, &ref, 0))
+ die(_("no such ref %s"), *av);
+ read_ref_at(get_main_ref_store(the_repository),
+ ref, flags, 0, i, &oid, &log_msg,
+ ×tamp, &tz, NULL);
+ end_log_msg = strchr(log_msg, '\n');
+ if (end_log_msg)
+ *end_log_msg = '\0';
+ skip_prefix(name, "refs/heads/", &name);
+ append_one_rev(name);
+ reflog_msg[ref_name_cnt - 1] = xstrfmt("(%s) (current) %s",
show_date(timestamp, tz, DATE_MODE(RELATIVE)), (!log_msg || !*log_msg) ?
"(none)" : log_msg);
+ free(log_msg);
}
}
diff --git a/t/t3202-show-branch.sh b/t/t3202-show-branch.sh
index 7a1be73ce8..7f6ffcf8a5 100755
--- a/t/t3202-show-branch.sh
+++ b/t/t3202-show-branch.sh
@@ -161,4 +161,47 @@ test_expect_success 'show branch --reflog=2' '
test_cmp actual expect
'
+test_expect_success 'show branch --reflog=2 --current' '
+ sed "s/^> //" >expect <<-\EOF &&
+ > ! [refs/heads/branch10@{0}] (4 years, 5 months ago) commit: branch10
+ > ! [refs/heads/branch10@{1}] (4 years, 5 months ago) commit: branch10
+ > * [branch10] (4 years, 5 months ago) (current) branch: Created
from initial
+ > ---
+ > + * [refs/heads/branch10@{0}] branch10
+ > ++* [refs/heads/branch10@{1}] initial
+ EOF
+ git show-branch --reflog=2 --current >actual &&
+ test_cmp actual expect
+'
+
+test_expect_success 'show branch --current' '
+ sed "s/^> //" >expect <<-\EOF &&
+ > ! [branch1] branch1
+ > ! [branch2] branch2
+ > ! [branch3] branch3
+ > ! [branch4] branch4
+ > ! [branch5] branch5
+ > ! [branch6] branch6
+ > ! [branch7] branch7
+ > ! [branch8] branch8
+ > ! [branch9] branch9
+ > * [branch10] branch10
+ > ! [master] initial
+ > -----------
+ > * [branch10] branch10
+ > + [branch9] branch9
+ > + [branch8] branch8
+ > + [branch7] branch7
+ > + [branch6] branch6
+ > + [branch5] branch5
+ > + [branch4] branch4
+ > + [branch3] branch3
+ > + [branch2] branch2
+ > + [branch1] branch1
+ > +++++++++*+ [master] initial
+ EOF
+ git show-branch --current >actual &&
+ test_cmp actual expect
+'
+
test_done
--
2.35.1
[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 2501 bytes --]
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 665 bytes --]
next reply other threads:[~2022-04-21 13:34 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-21 13:34 Gregory David [this message]
2022-04-21 15:33 ` [PATCH v3 0/2] show-brach: segfault fix from Gregory David Ævar Arnfjörð Bjarmason
2022-04-21 15:33 ` [PATCH v3 1/2] show-branch: refactor in preparation for next commit Ævar Arnfjörð Bjarmason
2022-04-21 18:13 ` Junio C Hamano
2022-04-21 15:33 ` [PATCH v3 2/2] show-branch: fix SEGFAULT when `--current` and `--reflog` together Ævar Arnfjörð Bjarmason
2022-04-21 18:36 ` Junio C Hamano
2022-04-21 21:25 ` [PATCH] show-branch: -g and --current are incompatible Junio C Hamano
-- strict thread matches above, loose matches on Subject: below --
2022-04-19 16:32 [PATCH] show-branch: fix SEGFAULT when `--current` and `--reflog` together Gregory David
2022-04-19 20:49 ` Ævar Arnfjörð Bjarmason
2022-04-20 10:04 ` Phillip Wood
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=225b410d-2d98-8c0b-c289-22f753c175d4@p1sec.com \
--to=gregory.david@p1sec.com \
--cc=git@vger.kernel.org \
--cc=ptm-dev@p1sec.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.
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).