Merge branch 'js/ci-windows-update'

[thirdparty/git.git] / revision.c

diff --git a/revision.c b/revision.c
index 8140561b6c7e23e76f645b530035fbabe0870839..cddd0542a657e10ef768d76a922e063286b9672e 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -316,9 +316,10 @@ static void add_pending_object_with_path(struct rev_info *revs,
                revs->no_walk = 0;
        if (revs->reflog_info && obj->type == OBJ_COMMIT) {
                struct strbuf buf = STRBUF_INIT;
-               int len = interpret_branch_name(name, 0, &buf, &options);
+               size_t namelen = strlen(name);
+               int len = interpret_branch_name(name, namelen, &buf, &options);
 
-               if (0 < len && name[len] && buf.len)
+               if (0 < len && len < namelen && buf.len)
                        strbuf_addstr(&buf, name + len);
                add_reflog_for_walk(revs->reflog_info,
                                    (struct commit *)obj,