From: Junio C Hamano <gitster@pobox.com>
To: Elia Pinto <gitter.spiros@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 31/32] commit-graph.c: fix code that could convert the result of an integer multiplication to a larger type
Date: Wed, 06 Nov 2019 11:23:00 +0900 [thread overview]
Message-ID: <xmqq7e4dwxob.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20191104095923.116086-2-gitter.spiros@gmail.com> (Elia Pinto's message of "Mon, 4 Nov 2019 09:59:22 +0000")
Elia Pinto <gitter.spiros@gmail.com> writes:
> Fix the LGTM warning fired by the rule that finds code that could convert the result of an integer
> multiplication to a larger type. Since the conversion applies after the multiplication,
> arithmetic overflow may still occur.
Overly long?
> chunk_offsets[0] = 8 + (num_chunks + 1) * GRAPH_CHUNKLOOKUP_WIDTH;
> chunk_offsets[1] = chunk_offsets[0] + GRAPH_FANOUT_SIZE;
> - chunk_offsets[2] = chunk_offsets[1] + hashsz * ctx->commits.nr;
> - chunk_offsets[3] = chunk_offsets[2] + (hashsz + 16) * ctx->commits.nr;
> + chunk_offsets[2] = chunk_offsets[1] + (uint64_t)hashsz * ctx->commits.nr;
> + chunk_offsets[3] = chunk_offsets[2] + ((uint64_t)hashsz + 16) * ctx->commits.nr;
chunk_offsets[] is u64[], while hashsz and is uint and
ctx->commits.nr is int. OK.
> @@ -1426,7 +1426,7 @@ static int write_commit_graph_file(struct write_commit_graph_context *ctx)
> }
> if (ctx->num_commit_graphs_after > 1) {
> chunk_offsets[num_chunks + 1] = chunk_offsets[num_chunks] +
> - hashsz * (ctx->num_commit_graphs_after - 1);
> + (uint64_t)hashsz * (ctx->num_commit_graphs_after - 1);
Likewise.
> @@ -1454,7 +1454,7 @@ static int write_commit_graph_file(struct write_commit_graph_context *ctx)
> num_chunks);
> ctx->progress = start_delayed_progress(
> progress_title.buf,
> - num_chunks * ctx->commits.nr);
> + (uint64_t)num_chunks * ctx->commits.nr);
Hmph, do we need this? I understand that the second parameter to
the callee is u64, so the caller needs to come up with u64 without
overflow, but doesn't that automatically get promoted?
> }
> write_graph_chunk_fanout(f, ctx);
> write_graph_chunk_oids(f, hashsz, ctx);
next prev parent reply other threads:[~2019-11-06 2:23 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-04 9:59 [PATCH 30/32] ident.c: fix LGTM warning on the possible abuse of the '=' operator Elia Pinto
2019-11-04 9:59 ` [PATCH 31/32] commit-graph.c: fix code that could convert the result of an integer multiplication to a larger type Elia Pinto
2019-11-06 2:23 ` Junio C Hamano [this message]
2019-11-07 2:23 ` Danh Doan
2019-11-07 3:37 ` Junio C Hamano
2019-11-07 4:06 ` Danh Doan
2019-11-07 12:49 ` Johannes Schindelin
2019-11-07 12:45 ` Johannes Schindelin
2019-11-04 9:59 ` [PATCH 32/32] date.c: fix code that may overflow 'int' before it is converted to 'time_t' Elia Pinto
2019-11-04 10:26 ` [PATCH 30/32] ident.c: fix LGTM warning on the possible abuse of the '=' operator SZEDER Gábor
2019-11-04 13:55 ` Elia Pinto
2019-11-04 15:11 ` Phillip Wood
2019-11-04 19:55 ` Elia Pinto
2019-11-06 2:16 ` Junio C Hamano
2019-11-06 11:32 ` Johannes Schindelin
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=xmqq7e4dwxob.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitter.spiros@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.
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).