kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'np/maint-huge-delta-generation' 

* np/maint-huge-delta-generation:
  fix >4GiB source delta assertion failure
maint
Junio C Hamano 2010-08-31 16:34:16 -07:00
parent 2acf3658a3 506049c7df
commit e3efa9c12c
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
diff-delta.c
View File

@ -147,6 +147,13 @@ struct delta_index * create_delta_index(const void *buf, unsigned long bufsize)
first byte to allow for optimizing the Rabin's polynomial first byte to allow for optimizing the Rabin's polynomial
initialization in create_delta(). */ initialization in create_delta(). */
entries = (bufsize - 1) / RABIN_WINDOW; entries = (bufsize - 1) / RABIN_WINDOW;
if (bufsize >= 0xffffffffUL) {
/*
* Current delta format can't encode offsets into
* reference buffer with more than 32 bits.
*/
entries = 0xfffffffeU / RABIN_WINDOW;
}
hsize = entries / 4; hsize = entries / 4;
for (i = 4; (1u << i) < hsize && i < 31; i++); for (i = 4; (1u << i) < hsize && i < 31; i++);
hsize = 1 << i; hsize = 1 << i;