X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=patch-delta.c;h=e3a1d425ee2e333bce0f87b1e50fc112a8ec51a3;hb=1efca00ad8fc1a7ad04d80a76ba852e0cce847b0;hp=8f318ed8aaf180419f97887501317fc1d2b54c09;hpb=0e84fb06a1022f99c96cfcd728e7bf029ef0b5e3;p=git.git diff --git a/patch-delta.c b/patch-delta.c index 8f318ed8a..e3a1d425e 100644 --- a/patch-delta.c +++ b/patch-delta.c @@ -25,7 +25,7 @@ void *patch_delta(const void *src_buf, unsigned long src_size, return NULL; data = delta_buf; - top = delta_buf + delta_size; + top = (const unsigned char *) delta_buf + delta_size; /* make sure the orig file size matches what we expect */ size = get_delta_hdr_size(&data, top); @@ -56,7 +56,7 @@ void *patch_delta(const void *src_buf, unsigned long src_size, cp_off + cp_size > src_size || cp_size > size) goto bad; - memcpy(out, src_buf + cp_off, cp_size); + memcpy(out, (char *) src_buf + cp_off, cp_size); out += cp_size; size -= cp_size; } else if (cmd) {