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 <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Dec 29, 2015 at 01:35 UTC
9a93c6686f56086fe5280a85513041bbfebf41d0
3 files changed
+3
-3
builtin/receive-pack.c
+1
-1
@@ -1597,7 +1597,7 @@ static void prepare_shallow_update(struct command *commands,
1597
continue;
1598
si->need_reachability_test[i]++;
1599
for (k = 0; k < 32; k++)
1600
- if (si->used_shallow[i][j] & (1 << k))
1600
+ if (si->used_shallow[i][j] & (1U << k))
1601
si->shallow_ref[j * 32 + k]++;
1602
}
1603
cache.h
+1
-1
@@ -214,7 +214,7 @@ struct cache_entry {
214
#define CE_INTENT_TO_ADD (1 << 29)
215
#define CE_SKIP_WORKTREE (1 << 30)
216
/* CE_EXTENDED2 is for future extension */
217
-#define CE_EXTENDED2 (1 << 31)
217
+#define CE_EXTENDED2 (1U << 31)
218
219
#define CE_EXTENDED_FLAGS (CE_INTENT_TO_ADD | CE_SKIP_WORKTREE)
220
diff.h
+1
-1
@@ -91,7 +91,7 @@ typedef struct strbuf *(*diff_prefix_fn_t)(struct diff_options *opt, void *data)
91
#define DIFF_OPT_DIRSTAT_BY_LINE (1 << 28)
92
#define DIFF_OPT_FUNCCONTEXT (1 << 29)
93
#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)
95
96
#define DIFF_OPT_TST(opts, flag) ((opts)->flags & DIFF_OPT_##flag)
97
#define DIFF_OPT_TOUCHED(opts, flag) ((opts)->touched_flags & DIFF_OPT_##flag)