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

Merge branch 'maint-1.6.0' into maint

Browse Source 
* maint-1.6.0:
  merge: fix out-of-bounds memory access
This commit is contained in:
Junio C Hamano 2009-01-31 17:42:17 -08:00
commit 6ac92294b3
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
unpack-trees.c
View File

@ -240,8 +240,11 @@ static struct cache_entry *create_ce_entry(const struct traverse_info *info, con
return ce; return ce;
} }
static int unpack_nondirectories(int n, unsigned long mask, unsigned long dirmask, struct cache_entry *src[5], static int unpack_nondirectories(int n, unsigned long mask,
const struct name_entry *names, const struct traverse_info *info) unsigned long dirmask,
struct cache_entry **src,
const struct name_entry *names,
const struct traverse_info *info)
{ {
int i; int i;
struct unpack_trees_options *o = info->data; struct unpack_trees_options *o = info->data;
@ -291,7 +294,7 @@ static int unpack_nondirectories(int n, unsigned long mask, unsigned long dirmas
static int unpack_callback(int n, unsigned long mask, unsigned long dirmask, struct name_entry *names, struct traverse_info *info) static int unpack_callback(int n, unsigned long mask, unsigned long dirmask, struct name_entry *names, struct traverse_info *info)
{ {
struct cache_entry *src[5] = { NULL, }; struct cache_entry *src[MAX_UNPACK_TREES + 1] = { NULL, };
struct unpack_trees_options *o = info->data; struct unpack_trees_options *o = info->data;
const struct name_entry *p = names; const struct name_entry *p = names;