Skip to content

Commit 9a93c66

Browse files
peffgitster
authored andcommitted
avoid shifting signed integers 31 bits
We sometimes use 32-bit unsigned integers as bit-fields. It's fine to access the MSB, because it's unsigned. However, doing so as "1 << 31" is wrong, because the constant "1" is a signed int, and we shift into the sign bit, causing undefined behavior. We can fix this by using "1U" as the constant. Signed-off-by: Jeff King <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 1ff8856 commit 9a93c66

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

builtin/receive-pack.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1597,7 +1597,7 @@ static void prepare_shallow_update(struct command *commands,
15971597
continue;
15981598
si->need_reachability_test[i]++;
15991599
for (k = 0; k < 32; k++)
1600-
if (si->used_shallow[i][j] & (1 << k))
1600+
if (si->used_shallow[i][j] & (1U << k))
16011601
si->shallow_ref[j * 32 + k]++;
16021602
}
16031603

cache.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ struct cache_entry {
214214
#define CE_INTENT_TO_ADD (1 << 29)
215215
#define CE_SKIP_WORKTREE (1 << 30)
216216
/* CE_EXTENDED2 is for future extension */
217-
#define CE_EXTENDED2 (1 << 31)
217+
#define CE_EXTENDED2 (1U << 31)
218218

219219
#define CE_EXTENDED_FLAGS (CE_INTENT_TO_ADD | CE_SKIP_WORKTREE)
220220

diff.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ typedef struct strbuf *(*diff_prefix_fn_t)(struct diff_options *opt, void *data)
9191
#define DIFF_OPT_DIRSTAT_BY_LINE (1 << 28)
9292
#define DIFF_OPT_FUNCCONTEXT (1 << 29)
9393
#define DIFF_OPT_PICKAXE_IGNORE_CASE (1 << 30)
94-
#define DIFF_OPT_DEFAULT_FOLLOW_RENAMES (1 << 31)
94+
#define DIFF_OPT_DEFAULT_FOLLOW_RENAMES (1U << 31)
9595

9696
#define DIFF_OPT_TST(opts, flag) ((opts)->flags & DIFF_OPT_##flag)
9797
#define DIFF_OPT_TOUCHED(opts, flag) ((opts)->touched_flags & DIFF_OPT_##flag)

0 commit comments

Comments
 (0)