diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-06-21 21:14:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-21 21:14:09 -0700 |
| commit | 44fb185963d42bb1dd6f1b3ea690d2a8f3c4edbc (patch) | |
| tree | e416edac27adfd1cf790f2aaa493b0e61a26d10f /patch-delta.c | |
| parent | 037e9d5b1575d7ede05b50c317d9d88258556d84 (diff) | |
| parent | 48fb7deb5bbd87933e7d314b73d7c1b52667f80f (diff) | |
| download | git-44fb185963d42bb1dd6f1b3ea690d2a8f3c4edbc.tar.gz | |
Merge branch 'lt/maint-unsigned-left-shift' into maint
* lt/maint-unsigned-left-shift:
Fix big left-shifts of unsigned char
Diffstat (limited to 'patch-delta.c')
| -rw-r--r-- | patch-delta.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/patch-delta.c b/patch-delta.c index ed9db81fa8..ef748ce96d 100644 --- a/patch-delta.c +++ b/patch-delta.c @@ -44,7 +44,7 @@ void *patch_delta(const void *src_buf, unsigned long src_size, if (cmd & 0x01) cp_off = *data++; if (cmd & 0x02) cp_off |= (*data++ << 8); if (cmd & 0x04) cp_off |= (*data++ << 16); - if (cmd & 0x08) cp_off |= (*data++ << 24); + if (cmd & 0x08) cp_off |= ((unsigned) *data++ << 24); if (cmd & 0x10) cp_size = *data++; if (cmd & 0x20) cp_size |= (*data++ << 8); if (cmd & 0x40) cp_size |= (*data++ << 16); |