diff options
| author | Nicolas Pitre <nico@cam.org> | 2007-04-09 01:06:29 -0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-10 12:48:14 -0700 |
| commit | 8723f216263ba4a0f06be7b93fada863c0931e09 (patch) | |
| tree | 6d357724c891ce009a8c7ae1a0a4083bc39ff1f5 /sha1_file.c | |
| parent | 57059091fad25427bce9b3d47e073ce0518d164b (diff) | |
| download | git-8723f216263ba4a0f06be7b93fada863c0931e09.tar.gz git-8723f216263ba4a0f06be7b93fada863c0931e09.tar.xz | |
make overflow test on delta base offset work regardless of variable size
This patch introduces the MSB() macro to obtain the desired number of
most significant bits from a given variable independently of the variable
type.
It is then used to better implement the overflow test on the OBJ_OFS_DELTA
base offset variable with the property of always working correctly
regardless of the type/size of that variable.
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'sha1_file.c')
| -rw-r--r-- | sha1_file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sha1_file.c b/sha1_file.c index d9ca69a91..ebdd497ba 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -1150,7 +1150,7 @@ static off_t get_delta_base(struct packed_git *p, base_offset = c & 127; while (c & 128) { base_offset += 1; - if (!base_offset || base_offset & ~(~0UL >> 7)) + if (!base_offset || MSB(base_offset, 7)) die("offset value overflow for delta base object"); c = base_info[used++]; base_offset = (base_offset << 7) + (c & 127); |