diff options
author | René Scharfe <l.s.r@web.de> | 2016-10-23 19:57:30 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-10-26 10:54:11 -0700 |
commit | bb84735c80dbae6408b79b56f574ae672d2232d4 (patch) | |
tree | 13277cde7f5aac48b6881025c5d0b240886a7b98 /path.c | |
parent | 23415c26fef155f2fa9aebf8a48a6ae457b68c7b (diff) | |
download | git-bb84735c80dbae6408b79b56f574ae672d2232d4.tar.gz |
hex: make wraparound of the index into ring-buffer explicitrs/ring-buffer-wraparound
Overflow is defined for unsigned integers, but not for signed ones.
We could make the ring-buffer index in sha1_to_hex() and
get_pathname() unsigned to be on the safe side to resolve this, but
let's make it explicit that we are wrapping around at whatever the
number of elements the ring-buffer has. The compiler is smart enough
to turn modulus into bitmask for these codepaths that use
ring-buffers of a size that is a power of 2.
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'path.c')
-rw-r--r-- | path.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -24,7 +24,8 @@ static struct strbuf *get_pathname(void) STRBUF_INIT, STRBUF_INIT, STRBUF_INIT, STRBUF_INIT }; static int index; - struct strbuf *sb = &pathname_array[3 & ++index]; + struct strbuf *sb = &pathname_array[index]; + index = (index + 1) % ARRAY_SIZE(pathname_array); strbuf_reset(sb); return sb; } |