From: Junio C Hamano <gitster@pobox.com>
To: Elijah Newren <newren@gmail.com>
Cc: "Andrzej Hunt via GitGitGadget" <gitgitgadget@gmail.com>,
"Git Mailing List" <git@vger.kernel.org>,
"René Scharfe" <l.s.r@web.de>, "Andrzej Hunt" <andrzej@ahunt.org>,
"Andrzej Hunt" <ajrhunt@google.com>
Subject: Re: [PATCH v2] merge-ort: only do pointer arithmetic for non-empty lists
Date: Mon, 12 Apr 2021 10:39:54 -0700 [thread overview]
Message-ID: <xmqqsg3ve711.fsf@gitster.g> (raw)
In-Reply-To: <CABPp-BE2D933Bc6w-OeaJc1r+1_tvMeK2M-HK4eEKPkQb3BdQQ@mail.gmail.com> (Elijah Newren's message of "Mon, 12 Apr 2021 08:52:14 -0700")
Elijah Newren <newren@gmail.com> writes:
> Otherwise, this patch looks good to me; thanks!
Queued, manually amended, and here is what I have.
$ git range-diff @{1}...
1: ca4cc8d182 ! 1: c1ea48a8f7 merge-ort: only do pointer arithmetic for non-empty lists
@@ Commit message
SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior merge-ort.c:2669:43 in
Signed-off-by: Andrzej Hunt <ajrhunt@google.com>
+ Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
## merge-ort.c ##
@@ merge-ort.c: static void write_tree(struct object_id *result_oid,
+ size_t hash_size)
+ {
size_t maxlen = 0, extra;
- unsigned int nr = versions->nr - offset;
+- unsigned int nr = versions->nr - offset;
++ unsigned int nr;
struct strbuf buf = STRBUF_INIT;
- struct string_list relevant_entries = STRING_LIST_INIT_NODUP;
int i;
@@ merge-ort.c: static void write_tree(struct object_id *result_oid,
- relevant_entries.nr = versions->nr - offset;
- QSORT(relevant_entries.items, relevant_entries.nr, tree_entry_order);
+ assert(offset <= versions->nr);
++ nr = versions->nr - offset;
+ if (versions->nr)
+ QSORT(versions->items + offset, nr, tree_entry_order);
next prev parent reply other threads:[~2021-04-12 17:40 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-10 8:30 [PATCH] merge-ort: only do pointer arithmetic for non-empty lists Andrzej Hunt via GitGitGadget
2021-04-10 11:48 ` René Scharfe
2021-04-10 22:56 ` Junio C Hamano
2021-04-11 9:14 ` Andrzej Hunt
2021-04-11 9:12 ` Andrzej Hunt
2021-04-11 11:05 ` [PATCH v2] " Andrzej Hunt via GitGitGadget
2021-04-12 15:52 ` Elijah Newren
2021-04-12 17:39 ` Junio C Hamano [this message]
2021-04-12 17:47 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqsg3ve711.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=ajrhunt@google.com \
--cc=andrzej@ahunt.org \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=l.s.r@web.de \
--cc=newren@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.