X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=sha1_file.c;h=ac7bf9fd271cd538e733d31332ab29cf36e4a69f;hb=af5323e0274fad058f13949b89a9191a7bef7e38;hp=ece9dff80d5dd0e64508e93bf3bc1611a954cbea;hpb=e99d59ff0bff349ef205cef1076e0354c8130680;p=git.git

diff --git a/sha1_file.c b/sha1_file.c
index ece9dff8..ac7bf9fd 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -6,9 +6,8 @@
  * This handles basic git sha1 object files - packing, unpacking,
  * creation etc.
  */
-#include <stdarg.h>
-#include <limits.h>
 #include "cache.h"
+#include "delta.h"
 
 #ifndef O_NOATIME
 #if defined(__linux__) && (defined(__i386__) || defined(__PPC__))
@@ -330,7 +329,7 @@ void * unpack_sha1_file(void *map, unsigned long mapsize, char *type, unsigned l
 		return NULL;
 
 	bytes = strlen(buffer) + 1;
-	buf = xmalloc(*size);
+	buf = xmalloc(1+*size);
 
 	memcpy(buf, buffer + bytes, stream.total_out - bytes);
 	bytes = stream.total_out - bytes;
@@ -340,6 +339,7 @@ void * unpack_sha1_file(void *map, unsigned long mapsize, char *type, unsigned l
 		while (inflate(&stream, Z_FINISH) == Z_OK)
 			/* nothing */;
 	}
+	buf[*size] = 0;
 	inflateEnd(&stream);
 	return buf;
 }
@@ -353,6 +353,19 @@ void * read_sha1_file(const unsigned char *sha1, char *type, unsigned long *size
 	if (map) {
 		buf = unpack_sha1_file(map, mapsize, type, size);
 		munmap(map, mapsize);
+		if (buf && !strcmp(type, "delta")) {
+			void *ref = NULL, *delta = buf;
+			unsigned long ref_size, delta_size = *size;
+			buf = NULL;
+			if (delta_size > 20)
+				ref = read_sha1_file(delta, type, &ref_size);
+			if (ref)
+				buf = patch_delta(ref, ref_size,
+						  delta+20, delta_size-20, 
+						  size);
+			free(delta);
+			free(ref);
+		}
 		return buf;
 	}
 	return NULL;