Skip to content

Commit 1e1f453

Browse files
committed
read-cache: check range before dereferencing an array element
Before accessing an array element at a given index, we should make sure that the index is within the desired bounds, not afterwards, otherwise it may not make sense to even access the array element in the first place. Pointed out by CodeQL's `cpp/offset-use-before-range-check` rule. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent f9efaf1 commit 1e1f453

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

read-cache.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -2686,8 +2686,8 @@ static int ce_write_entry(struct hashfile *f, struct cache_entry *ce,
26862686
int common, to_remove, prefix_size;
26872687
unsigned char to_remove_vi[16];
26882688
for (common = 0;
2689-
(ce->name[common] &&
2690-
common < previous_name->len &&
2689+
(common < previous_name->len &&
2690+
ce->name[common] &&
26912691
ce->name[common] == previous_name->buf[common]);
26922692
common++)
26932693
; /* still matching */

0 commit comments

Comments
 (0)