X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=patch-delta.c;h=c0e13114351c4ea427ddfe4d9e9c20a541201ad6;hb=d60fc1c8649f80c006b9f493c542461e81608d4b;hp=98c27beb252420102de78e50994ed5cc5b6f564a;hpb=67d42212ff104aaafa97b943cb369b8444f61581;p=git.git

diff --git a/patch-delta.c b/patch-delta.c
index 98c27beb..c0e13114 100644
--- a/patch-delta.c
+++ b/patch-delta.c
@@ -44,16 +44,15 @@ void *patch_delta(void *src_buf, unsigned long src_size,
 		cmd = *data++;
 		if (cmd & 0x80) {
 			unsigned long cp_off = 0, cp_size = 0;
-			const unsigned char *buf;
 			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 & 0x10) cp_size = *data++;
 			if (cmd & 0x20) cp_size |= (*data++ << 8);
+			if (cmd & 0x40) cp_size |= (*data++ << 16);
 			if (cp_size == 0) cp_size = 0x10000;
-			buf = (cmd & 0x40) ? dst_buf : src_buf;
-			memcpy(out, buf + cp_off, cp_size);
+			memcpy(out, src_buf + cp_off, cp_size);
 			out += cp_size;
 		} else {
 			memcpy(out, data, cmd);