aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-12-12 16:42:38 -0800
committerJunio C Hamano <junkio@cox.net>2005-12-12 16:42:38 -0800
commitc7a45bd20e4ec141fdc15f36d261a45d51d95693 (patch)
tree906269c34cada1b3028d3f4013bae3a595d20625
parent44db136cad84c003506e231a38935ca6acba4d7d (diff)
downloadgit-c7a45bd20e4ec141fdc15f36d261a45d51d95693.tar.gz
git-c7a45bd20e4ec141fdc15f36d261a45d51d95693.tar.xz
Revert "diff-delta.c: allow delta with empty blob."
This reverts 962537a3eb03a118cf27d9d0da365a3216ed1caa commit to play safe.
-rw-r--r--delta.h4
-rw-r--r--diff-delta.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/delta.h b/delta.h
index c6a476353..31d1820f8 100644
--- a/delta.h
+++ b/delta.h
@@ -9,8 +9,8 @@ extern void *patch_delta(void *src_buf, unsigned long src_size,
void *delta_buf, unsigned long delta_size,
unsigned long *dst_size);
-/* the smallest possible delta size is 2 bytes (empty to empty) */
-#define DELTA_SIZE_MIN 2
+/* the smallest possible delta size is 4 bytes */
+#define DELTA_SIZE_MIN 4
/*
* This must be called twice on the delta data buffer, first to get the
diff --git a/diff-delta.c b/diff-delta.c
index cf5013896..b2ae7b5e6 100644
--- a/diff-delta.c
+++ b/diff-delta.c
@@ -213,7 +213,7 @@ void *diff_delta(void *from_buf, unsigned long from_size,
bdrecord_t *brec;
bdfile_t bdf;
- if (delta_prepare(from_buf, from_size, &bdf))
+ if (!from_size || !to_size || delta_prepare(from_buf, from_size, &bdf))
return NULL;
outpos = 0;