diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-05-09 13:54:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-09 13:54:42 -0700 |
| commit | 016cd9f6654248ebfc25f3c0d3b0e6ee6f2c81f0 (patch) | |
| tree | 59ea0858fbdb88a97a466e6c3468038796ad252c /read-cache.c | |
| parent | 45f75a0167b4a4693f2c6005bf7db231ca91ecc8 (diff) | |
| parent | 28cc4ab4224164971a523e8a6c222b5ab2bae27d (diff) | |
| download | git-016cd9f6654248ebfc25f3c0d3b0e6ee6f2c81f0.tar.xz | |
Merge branch 'fix'
* fix:
read-cache.c: use xcalloc() not calloc()
apply: fix infinite loop with multiple patches with --index
Diffstat (limited to 'read-cache.c')
| -rw-r--r-- | read-cache.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/read-cache.c b/read-cache.c index f97f92d90a..a917ab0cfe 100644 --- a/read-cache.c +++ b/read-cache.c @@ -552,7 +552,7 @@ int read_cache(void) active_nr = ntohl(hdr->hdr_entries); active_alloc = alloc_nr(active_nr); - active_cache = calloc(active_alloc, sizeof(struct cache_entry *)); + active_cache = xcalloc(active_alloc, sizeof(struct cache_entry *)); offset = sizeof(*hdr); for (i = 0; i < active_nr; i++) { |