From: Christian Couder <christian.couder@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org>,
Christian Couder <chriscool@tuxfamily.org>
Subject: [PATCH] show-branch: fix crash with long ref name
Date: Tue, 14 Feb 2017 16:48:16 +0100 [thread overview]
Message-ID: <20170214154816.12625-1-chriscool@tuxfamily.org> (raw)
This is a minimum fix for a crash with a long ref name.
Note that if the refname is too long (for example if you
use 100 instead of 50 in the test script) you could get
an error like:
fatal: cannot lock ref 'refs/heads/1_2_3_4_ ... _98_99_100_':
Unable to create '... /.git/refs/heads/1_2_3_4_ ... _98_99_100_.lock':
File name too long
when creating the ref instead of a crash when using
show-branch and that would be ok.
So a simpler fix could have been just something like:
- char head[128];
+ char head[1024];
But if the filesystem ever allows filenames longer than 1024
characters then the crash could appear again.
Reported by: Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
builtin/show-branch.c | 14 +++++++-------
t/t3204-show-branch-refname.sh | 19 +++++++++++++++++++
2 files changed, 26 insertions(+), 7 deletions(-)
create mode 100755 t/t3204-show-branch-refname.sh
diff --git a/builtin/show-branch.c b/builtin/show-branch.c
index 974f3403ab..3c0fe55eec 100644
--- a/builtin/show-branch.c
+++ b/builtin/show-branch.c
@@ -620,7 +620,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
int all_heads = 0, all_remotes = 0;
int all_mask, all_revs;
enum rev_sort_order sort_order = REV_SORT_IN_GRAPH_ORDER;
- char head[128];
+ char *head_cpy;
const char *head_p;
int head_len;
struct object_id head_oid;
@@ -791,11 +791,11 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
head_oid.hash, NULL);
if (head_p) {
head_len = strlen(head_p);
- memcpy(head, head_p, head_len + 1);
+ head_cpy = xstrdup(head_p);
}
else {
head_len = 0;
- head[0] = 0;
+ head_cpy = xstrdup("");
}
if (with_current_branch && head_p) {
@@ -804,15 +804,15 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
/* We are only interested in adding the branch
* HEAD points at.
*/
- if (rev_is_head(head,
+ if (rev_is_head(head_cpy,
head_len,
ref_name[i],
head_oid.hash, NULL))
has_head++;
}
if (!has_head) {
- int offset = starts_with(head, "refs/heads/") ? 11 : 0;
- append_one_rev(head + offset);
+ int offset = starts_with(head_cpy, "refs/heads/") ? 11 : 0;
+ append_one_rev(head_cpy + offset);
}
}
@@ -865,7 +865,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
if (1 < num_rev || extra < 0) {
for (i = 0; i < num_rev; i++) {
int j;
- int is_head = rev_is_head(head,
+ int is_head = rev_is_head(head_cpy,
head_len,
ref_name[i],
head_oid.hash,
diff --git a/t/t3204-show-branch-refname.sh b/t/t3204-show-branch-refname.sh
new file mode 100755
index 0000000000..83b64e3032
--- /dev/null
+++ b/t/t3204-show-branch-refname.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+test_description='test show-branch with long refname'
+
+. ./test-lib.sh
+
+test_expect_success 'setup' '
+
+ test_commit first &&
+ long_refname=$(printf "%s_" $(seq 1 50)) &&
+ git checkout -b "$long_refname"
+'
+
+test_expect_success 'show-branch with long refname' '
+
+ git show-branch first
+'
+
+test_done
--
2.12.0.rc0
next reply other threads:[~2017-02-14 15:48 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-14 15:48 Christian Couder [this message]
2017-02-14 17:25 ` [PATCH] show-branch: fix crash with long ref name Jeff King
2017-02-14 17:26 ` [PATCH 1/3] show-branch: drop head_len variable Jeff King
2017-02-14 17:27 ` [PATCH 2/3] show-branch: store resolved head in heap buffer Jeff King
2017-02-14 17:28 ` [PATCH 3/3] show-branch: use skip_prefix to drop magic numbers Jeff King
2017-02-14 18:53 ` Pranit Bauva
2017-02-14 19:53 ` Jeff King
2017-02-14 19:35 ` [PATCH] show-branch: fix crash with long ref name Junio C Hamano
2017-02-14 19:55 ` Jeff King
2017-02-14 21:29 ` Christian Couder
2017-02-15 21:40 ` Jeff King
2017-02-15 21:50 ` Junio C Hamano
2017-02-15 21:52 ` Jeff King
2017-02-16 12:40 ` Christian Couder
2017-02-17 5:03 ` Jeff King
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=20170214154816.12625-1-chriscool@tuxfamily.org \
--to=christian.couder@gmail.com \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=maxim.kuvyrkov@linaro.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.
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).