Skip to content

Commit 104add8

Browse files
dschogitster
authored andcommitted
diff: check range before dereferencing an array element
Before accessing an array element at a given index, it should be verified 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. This is the point of CodeQL's `cpp/offset-use-before-range-check` rule. This CodeQL rule unfortunately is also triggered by the `fill_es_indent_data()` code, even though the condition `off < len - 1` does not even need to guarantee that the offset is in bounds (`s` points to a NUL-terminated string, for which `s[off] == '\r'` would fail before running out of bounds). Let's work around this rare false positive to help us use an otherwise mostly useful tool is a worthy thing to do. Signed-off-by: Johannes Schindelin <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent d50a5e8 commit 104add8

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

diff.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -892,7 +892,7 @@ static void fill_es_indent_data(struct emitted_diff_symbol *es)
892892

893893
/* skip any \v \f \r at start of indentation */
894894
while (s[off] == '\f' || s[off] == '\v' ||
895-
(s[off] == '\r' && off < len - 1))
895+
(off < len - 1 && s[off] == '\r'))
896896
off++;
897897

898898
/* calculate the visual width of indentation */

0 commit comments

Comments
 (0)