X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=patch-delta.c;h=c0e13114351c4ea427ddfe4d9e9c20a541201ad6;hb=7b0c996679e975b666fd27c922e1e0837b611c98;hp=26281ea1230f730931442bc0ed59966a6f4031be;hpb=3f81fc82743ccd4fd7157f1f1db41605eb018fb9;p=git.git

diff --git a/patch-delta.c b/patch-delta.c
index 26281ea1..c0e13114 100644
--- a/patch-delta.c
+++ b/patch-delta.c
@@ -34,25 +34,25 @@ void *patch_delta(void *src_buf, unsigned long src_size,
 
 	/* now the result size */
 	size = get_delta_hdr_size(&data);
-	dst_buf = malloc(size);
+	dst_buf = malloc(size + 1);
 	if (!dst_buf)
 		return NULL;
+	dst_buf[size] = 0;
 
 	out = dst_buf;
 	while (data < top) {
 		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);