combine-diff: better hunk splitting.

diff --git a/patch-delta.c b/patch-delta.c
index b68dd13c63be4a3834354916398b1ab4827334cc..98c27beb252420102de78e50994ed5cc5b6f564a 100644 (file)
--- 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) {