diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-06-18 11:23:22 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-06-18 11:23:22 -0700 |
commit | f35f43f565c99d5cbbac210b82448d9f445c9607 (patch) | |
tree | b03ce86ff4b83a5a3d57675862308310413ae959 /dir.c | |
parent | 1663e2ba6863afa949dd84b3286b52290049daa9 (diff) | |
parent | 1140bf01ecf4a49c32b3c385dd782cd183e730af (diff) | |
download | git-f35f43f565c99d5cbbac210b82448d9f445c9607.tar.gz |
Merge branch 'jk/ewah-bounds-check'
The code to read compressed bitmap was not careful to avoid reading
past the end of the file, which has been corrected.
* jk/ewah-bounds-check:
ewah: adjust callers of ewah_read_mmap()
ewah_read_mmap: bounds-check mmap reads
Diffstat (limited to 'dir.c')
-rw-r--r-- | dir.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -2853,7 +2853,8 @@ struct untracked_cache *read_untracked_extension(const void *data, unsigned long struct read_data rd; const unsigned char *next = data, *end = (const unsigned char *)data + sz; const char *ident; - int ident_len, len; + int ident_len; + ssize_t len; const char *exclude_per_dir; if (sz <= 1 || end[-1] != '\0') |