diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-06-20 21:46:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-20 21:46:10 -0700 |
| commit | 7c74c3926ad60ba1bbfed13355f00a29813a0f32 (patch) | |
| tree | 45d5169b6377988e617a9d1a2096b98f31d07a49 /index-pack.c | |
| parent | Merge git://git.kernel.org/pub/scm/gitk/gitk (diff) | |
| parent | Fix big left-shifts of unsigned char (diff) | |
| download | git-7c74c3926ad60ba1bbfed13355f00a29813a0f32.tar.gz git-7c74c3926ad60ba1bbfed13355f00a29813a0f32.zip | |
Merge branch 'lt/maint-unsigned-left-shift'
* lt/maint-unsigned-left-shift:
Fix big left-shifts of unsigned char
Diffstat (limited to 'index-pack.c')
| -rw-r--r-- | index-pack.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/index-pack.c b/index-pack.c index 6e93ee6af6..0c92bafcbb 100644 --- a/index-pack.c +++ b/index-pack.c @@ -293,8 +293,8 @@ static void *unpack_entry_data(unsigned long offset, unsigned long size) static void *unpack_raw_entry(struct object_entry *obj, union delta_base *delta_base) { - unsigned char *p, c; - unsigned long size; + unsigned char *p; + unsigned long size, c; off_t base_offset; unsigned shift; void *data; @@ -312,7 +312,7 @@ static void *unpack_raw_entry(struct object_entry *obj, union delta_base *delta_ p = fill(1); c = *p; use(1); - size += (c & 0x7fUL) << shift; + size += (c & 0x7f) << shift; shift += 7; } obj->size = size; |