Merge branch 'master' into next

diff --git a/read-cache.c b/read-cache.c
index 1f71d125780fbaecf613f8b979fcc04b1b630c97..ed0da38e07cdb3d0a05a12bdebf10d833e53bd08 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -583,7 +583,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++) {