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

Merge branch 'tb/attr-limits' into maint-2.45 

The maximum size of attribute files is enforced more consistently.

* tb/attr-limits:
  attr.c: move ATTR_MAX_FILE_SIZE check into read_attr_from_buf()
maint
Junio C Hamano 2024-06-28 15:53:10 -07:00
parent a5adab9b16 c793f9cb08
commit 6840423c6f
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
attr.c
View File

@ -765,8 +765,8 @@ static struct attr_stack *read_attr_from_file(const char *path, unsigned flags)
return res; return res;
} }


static struct attr_stack *read_attr_from_buf(char *buf, const char *path, static struct attr_stack *read_attr_from_buf(char *buf, size_t length,
unsigned flags) const char *path, unsigned flags)
{ {
struct attr_stack *res; struct attr_stack *res;
char *sp; char *sp;
@ -774,6 +774,11 @@ static struct attr_stack *read_attr_from_buf(char *buf, const char *path,


if (!buf) if (!buf)
return NULL; return NULL;
if (length >= ATTR_MAX_FILE_SIZE) {
warning(_("ignoring overly large gitattributes blob '%s'"), path);
free(buf);
return NULL;
}


CALLOC_ARRAY(res, 1); CALLOC_ARRAY(res, 1);
for (sp = buf; *sp;) { for (sp = buf; *sp;) {
@ -813,7 +818,7 @@ static struct attr_stack *read_attr_from_blob(struct index_state *istate,
return NULL; return NULL;
} }


return read_attr_from_buf(buf, path, flags); return read_attr_from_buf(buf, sz, path, flags);
} }


static struct attr_stack *read_attr_from_index(struct index_state *istate, static struct attr_stack *read_attr_from_index(struct index_state *istate,
@ -860,13 +865,7 @@ static struct attr_stack *read_attr_from_index(struct index_state *istate,
stack = read_attr_from_blob(istate, &istate->cache[sparse_dir_pos]->oid, relative_path, flags); stack = read_attr_from_blob(istate, &istate->cache[sparse_dir_pos]->oid, relative_path, flags);
} else { } else {
buf = read_blob_data_from_index(istate, path, &size); buf = read_blob_data_from_index(istate, path, &size);
if (!buf) stack = read_attr_from_buf(buf, size, path, flags);
return NULL;
if (size >= ATTR_MAX_FILE_SIZE) {
warning(_("ignoring overly large gitattributes blob '%s'"), path);
return NULL;
}
stack = read_attr_from_buf(buf, path, flags);
} }
return stack; return stack;
} }

10
t/t0003-attributes.sh
View File

@ -578,6 +578,16 @@ test_expect_success EXPENSIVE 'large attributes file ignored in index' '
test_cmp expect err test_cmp expect err
' '


test_expect_success EXPENSIVE 'large attributes blob ignored' '
test_when_finished "git update-index --remove .gitattributes" &&
blob=$(dd if=/dev/zero bs=1048576 count=101 2>/dev/null | git hash-object -w --stdin) &&
git update-index --add --cacheinfo 100644,$blob,.gitattributes &&
tree="$(git write-tree)" &&
git check-attr --cached --all --source="$tree" path >/dev/null 2>err &&
echo "warning: ignoring overly large gitattributes blob ${SQ}.gitattributes${SQ}" >expect &&
test_cmp expect err
'

test_expect_success 'builtin object mode attributes work (dir and regular paths)' ' test_expect_success 'builtin object mode attributes work (dir and regular paths)' '
>normal && >normal &&
attr_check_object_mode normal 100644 && attr_check_object_mode normal 100644 &&