fetch and pull: learn --progress

diff --git a/patch-delta.c b/patch-delta.c
index e3a1d425ee2e333bce0f87b1e50fc112a8ec51a3..d218faa02bd12b0e6a0df298a6a0e5787e46d93f 100644 (file)
--- a/patch-delta.c
+++ b/patch-delta.c
@@ -2,15 +2,14 @@
  * patch-delta.c:
  * recreate a buffer from a source and the delta produced by diff-delta.c
  *
- * (C) 2005 Nicolas Pitre <nico@cam.org>
+ * (C) 2005 Nicolas Pitre <nico@fluxnic.net>
  *
  * This code is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
 
-#include <stdlib.h>
-#include <string.h>
+#include "git-compat-util.h"
 #include "delta.h"
 
 void *patch_delta(const void *src_buf, unsigned long src_size,
@@ -34,10 +33,7 @@ void *patch_delta(const void *src_buf, unsigned long src_size,
 
        /* now the result size */
        size = get_delta_hdr_size(&data, top);
-       dst_buf = malloc(size + 1);
-       if (!dst_buf)
-               return NULL;
-       dst_buf[size] = 0;
+       dst_buf = xmallocz(size);
 
        out = dst_buf;
        while (data < top) {
@@ -47,7 +43,7 @@ void *patch_delta(const void *src_buf, unsigned long src_size,
                        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 & 0x08) cp_off |= ((unsigned) *data++ << 24);
                        if (cmd & 0x10) cp_size = *data++;
                        if (cmd & 0x20) cp_size |= (*data++ << 8);
                        if (cmd & 0x40) cp_size |= (*data++ << 16);
@@ -55,13 +51,13 @@ void *patch_delta(const void *src_buf, unsigned long src_size,
                        if (cp_off + cp_size < cp_size ||
                            cp_off + cp_size > src_size ||
                            cp_size > size)
-                               goto bad;
+                               break;
                        memcpy(out, (char *) src_buf + cp_off, cp_size);
                        out += cp_size;
                        size -= cp_size;
                } else if (cmd) {
                        if (cmd > size)
-                               goto bad;
+                               break;
                        memcpy(out, data, cmd);
                        out += cmd;
                        data += cmd;
@@ -72,12 +68,14 @@ void *patch_delta(const void *src_buf, unsigned long src_size,
                         * extensions. In the mean time we must fail when
                         * encountering them (might be data corruption).
                         */
+                       error("unexpected delta opcode 0");
                        goto bad;
                }
        }
 
        /* sanity check */
        if (data != top || size != 0) {
+               error("delta replay has gone wild");
                bad:
                free(dst_buf);
                return NULL;