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 /hex.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 'hex.c')
-rw-r--r-- | hex.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -78,7 +78,8 @@ char *sha1_to_hex(const unsigned char *sha1) { static int bufno; static char hexbuffer[4][GIT_SHA1_HEXSZ + 1]; - return sha1_to_hex_r(hexbuffer[3 & ++bufno], sha1); + bufno = (bufno + 1) % ARRAY_SIZE(hexbuffer); + return sha1_to_hex_r(hexbuffer[bufno], sha1); } char *oid_to_hex(const struct object_id *oid) |