diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-07-21 12:35:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-21 12:35:39 -0700 |
| commit | 9ab08822556c49a7856dadd0e9a42f9ec2aaf850 (patch) | |
| tree | f52f20367d13f2078fe6199e230322c899b9308d /pathspec.c | |
| parent | 0eff86e4f440fedf26f02f4c3b1a3ead8bfbe6f8 (diff) | |
| parent | 5c0b13f85ab3a5326508b854768eb70c8829cda4 (diff) | |
| download | git-9ab08822556c49a7856dadd0e9a42f9ec2aaf850.tar.gz | |
Merge branch 'maint'
* maint:
use xmemdupz() to allocate copies of strings given by start and length
use xcalloc() to allocate zero-initialized memory
Diffstat (limited to 'pathspec.c')
| -rw-r--r-- | pathspec.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pathspec.c b/pathspec.c index 89f2c8ffff..9304ee33d7 100644 --- a/pathspec.c +++ b/pathspec.c @@ -389,8 +389,7 @@ void parse_pathspec(struct pathspec *pathspec, if (!(flags & PATHSPEC_PREFER_CWD)) die("BUG: PATHSPEC_PREFER_CWD requires arguments"); - pathspec->items = item = xmalloc(sizeof(*item)); - memset(item, 0, sizeof(*item)); + pathspec->items = item = xcalloc(1, sizeof(*item)); item->match = prefix; item->original = prefix; item->nowildcard_len = item->len = strlen(prefix); |