X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=patch-delta.c;h=98c27beb252420102de78e50994ed5cc5b6f564a;hb=af6e277c5eddbcf82582b4bbd3e50b36aa61a20a;hp=b68dd13c63be4a3834354916398b1ab4827334cc;hpb=69a2d426f0d249bca2c6f754b3c1283c0fa72fd4;p=git.git

diff --git a/patch-delta.c b/patch-delta.c
index b68dd13c..98c27beb 100644
--- a/patch-delta.c
+++ b/patch-delta.c
@@ -20,39 +20,24 @@ void *patch_delta(void *src_buf, unsigned long src_size,
 	const unsigned char *data, *top;
 	unsigned char *dst_buf, *out, cmd;
 	unsigned long size;
-	int i;
 
-	/* the smallest delta size possible is 4 bytes */
-	if (delta_size < 4)
+	if (delta_size < DELTA_SIZE_MIN)
 		return NULL;
 
 	data = delta_buf;
 	top = delta_buf + delta_size;
 
 	/* make sure the orig file size matches what we expect */
-	cmd = *data++;
-	size = cmd & ~0x80;
-	i = 7;
-	while (cmd & 0x80) {
-		cmd = *data++;
-		size |= (cmd & ~0x80) << i;
-		i += 7;
-	}
+	size = get_delta_hdr_size(&data);
 	if (size != src_size)
 		return NULL;
 
 	/* now the result size */
-	cmd = *data++;
-	size = cmd & ~0x80;
-	i = 7;
-	while (cmd & 0x80) {
-		cmd = *data++;
-		size |= (cmd & ~0x80) << i;
-		i += 7;
-	}
-	dst_buf = malloc(size);
+	size = get_delta_hdr_size(&data);
+	dst_buf = malloc(size + 1);
 	if (!dst_buf)
 		return NULL;
+	dst_buf[size] = 0;
 
 	out = dst_buf;
 	while (data < top) {