diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2013-07-14 08:35:36 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-15 17:56:07 (GMT) |
| commit | 8f4f8f4579fe8cc630e118cc736de2b8d5cf8e34 (patch) | |
| tree | 84c3f6e022bd7c4e81d05ca725a469e72806d00e /tree-walk.c | |
| parent | dad2586a6b30da902d5f1979221eccc474425a7a (diff) | |
| download | git-8f4f8f4579fe8cc630e118cc736de2b8d5cf8e34.zip git-8f4f8f4579fe8cc630e118cc736de2b8d5cf8e34.tar.gz git-8f4f8f4579fe8cc630e118cc736de2b8d5cf8e34.tar.bz2 | |
guard against new pathspec magic in pathspec matching code
GUARD_PATHSPEC() marks pathspec-sensitive code, basically all those
that touch anything in 'struct pathspec' except fields "nr" and
"original". GUARD_PATHSPEC() is not supposed to fail. It's mainly to
help the designers catch unsupported codepaths.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'tree-walk.c')
| -rw-r--r-- | tree-walk.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tree-walk.c b/tree-walk.c index d399ca9..37b157e 100644 --- a/tree-walk.c +++ b/tree-walk.c @@ -636,6 +636,8 @@ enum interesting tree_entry_interesting(const struct name_entry *entry, enum interesting never_interesting = ps->has_wildcard ? entry_not_interesting : all_entries_not_interesting; + GUARD_PATHSPEC(ps, PATHSPEC_FROMTOP | PATHSPEC_MAXDEPTH); + if (!ps->nr) { if (!ps->recursive || !(ps->magic & PATHSPEC_MAXDEPTH) || |