X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=delta.h;h=9464f3e9b08b959d11305688ce194867a4017817;hb=e88856b485cd73dfc1f3ef8d4c5b52a2f557e8c8;hp=00fef0b8d739702c6cf664b35679c4897c0ca13f;hpb=0c1fc940eeae051e890304c40d1e66a478afadc8;p=git.git

diff --git a/delta.h b/delta.h
index 00fef0b8..9464f3e9 100644
--- a/delta.h
+++ b/delta.h
@@ -4,8 +4,7 @@
 /* handling of delta buffers */
 extern void *diff_delta(void *from_buf, unsigned long from_size,
 			void *to_buf, unsigned long to_size,
-		        unsigned long *delta_size, unsigned long max_size,
-			void **from_index);
+		        unsigned long *delta_size, unsigned long max_size);
 extern void *patch_delta(void *src_buf, unsigned long src_size,
 			 void *delta_buf, unsigned long delta_size,
 			 unsigned long *dst_size);
@@ -17,7 +16,8 @@ extern void *patch_delta(void *src_buf, unsigned long src_size,
  * This must be called twice on the delta data buffer, first to get the
  * expected reference buffer size, and again to get the result buffer size.
  */
-static inline unsigned long get_delta_hdr_size(const unsigned char **datap)
+static inline unsigned long get_delta_hdr_size(const unsigned char **datap,
+					       const unsigned char *top)
 {
 	const unsigned char *data = *datap;
 	unsigned char cmd;
@@ -27,7 +27,7 @@ static inline unsigned long get_delta_hdr_size(const unsigned char **datap)
 		cmd = *data++;
 		size |= (cmd & ~0x80) << i;
 		i += 7;
-	} while (cmd & 0x80);
+	} while (cmd & 0x80 && data < top);
 	*datap = data;
 	return size;
 }