undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source 
* master:
  gitk: Fix incorrect invocation of getmergediffline
  [PATCH] gitk: Fix searching for filenames in gitk
  count-delta: match get_delta_hdr_size() changes.
  check patch_delta bounds more carefully
This commit is contained in:
Junio C Hamano 2006-04-07 16:53:06 -07:00
commit 1b25fd191d
4 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
delta.h
View File

@ -16,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 * 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. * 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; const unsigned char *data = *datap;
unsigned char cmd; unsigned char cmd;
@ -26,7 +27,7 @@ static inline unsigned long get_delta_hdr_size(const unsigned char **datap)
cmd = *data++; cmd = *data++;
size |= (cmd & ~0x80) << i; size |= (cmd & ~0x80) << i;
i += 7; i += 7;
} while (cmd & 0x80); } while (cmd & 0x80 && data < top);
*datap = data; *datap = data;
return size; return size;
} }

4
gitk
View File

@ -2230,7 +2230,7 @@ proc donefilediff {} {
} }
} }
proc findcont {id} { proc findcont {} {
global findid treediffs parentlist global findid treediffs parentlist
global ffileline findstartline finddidsel global ffileline findstartline finddidsel
global displayorder numcommits matchinglines findinprogress global displayorder numcommits matchinglines findinprogress
@ -2700,7 +2700,7 @@ proc getmergediffline {mdf id np} {
incr nextupdate 100 incr nextupdate 100
fileevent $mdf readable {} fileevent $mdf readable {}
update update
fileevent $mdf readable [list getmergediffline $mdf $id] fileevent $mdf readable [list getmergediffline $mdf $id $np]
} }
} }

26
patch-delta.c
View File

@ -28,12 +28,12 @@ void *patch_delta(void *src_buf, unsigned long src_size,
top = delta_buf + delta_size; top = delta_buf + delta_size;
/* make sure the orig file size matches what we expect */ /* make sure the orig file size matches what we expect */
size = get_delta_hdr_size(&data); size = get_delta_hdr_size(&data, top);
if (size != src_size) if (size != src_size)
return NULL; return NULL;
/* now the result size */ /* now the result size */
size = get_delta_hdr_size(&data); size = get_delta_hdr_size(&data, top);
dst_buf = malloc(size + 1); dst_buf = malloc(size + 1);
if (!dst_buf) if (!dst_buf)
return NULL; return NULL;
@ -52,21 +52,37 @@ void *patch_delta(void *src_buf, unsigned long src_size,
if (cmd & 0x20) cp_size |= (*data++ << 8); if (cmd & 0x20) cp_size |= (*data++ << 8);
if (cmd & 0x40) cp_size |= (*data++ << 16); if (cmd & 0x40) cp_size |= (*data++ << 16);
if (cp_size == 0) cp_size = 0x10000; if (cp_size == 0) cp_size = 0x10000;
if (cp_off + cp_size < cp_size ||
cp_off + cp_size > src_size ||
cp_size > size)
goto bad;
memcpy(out, src_buf + cp_off, cp_size); memcpy(out, src_buf + cp_off, cp_size);
out += cp_size; out += cp_size;
} else { size -= cp_size;
} else if (cmd) {
if (cmd > size)
goto bad;
memcpy(out, data, cmd); memcpy(out, data, cmd);
out += cmd; out += cmd;
data += cmd; data += cmd;
size -= cmd;
} else {
/*
* cmd == 0 is reserved for future encoding
* extensions. In the mean time we must fail when
* encountering them (might be data corruption).
*/
goto bad;
} }
} }
/* sanity check */ /* sanity check */
if (data != top || out - dst_buf != size) { if (data != top || size != 0) {
bad:
free(dst_buf); free(dst_buf);
return NULL; return NULL;
} }
*dst_size = size; *dst_size = out - dst_buf;
return dst_buf; return dst_buf;
} }

6
sha1_file.c
View File

@ -808,10 +808,12 @@ static int packed_delta_info(unsigned char *base_sha1,
* the result size. * the result size.
*/ */
data = delta_head; data = delta_head;
get_delta_hdr_size(&data); /* ignore base size */
/* ignore base size */
get_delta_hdr_size(&data, delta_head+sizeof(delta_head));
/* Read the result size */ /* Read the result size */
result_size = get_delta_hdr_size(&data); result_size = get_delta_hdr_size(&data, delta_head+sizeof(delta_head));
*sizep = result_size; *sizep = result_size;
} }
return 0; return 0;