Initialize lock_file struct to all zero.

hold_lock_file_for_update() relies on that.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/builtin-update-index.c b/builtin-update-index.c
index 325cd0944dd81e1531dd097da3069c46a5321523..ef50243452c2f27572c941a5db9365c785f1fbd5 100644 (file)
--- a/builtin-update-index.c
+++ b/builtin-update-index.c
@@ -490,7 +490,7 @@ int cmd_update_index(int argc, const char **argv, char **envp)
        git_config(git_default_config);
 
        /* We can't free this memory, it becomes part of a linked list parsed atexit() */
        git_config(git_default_config);
 
        /* We can't free this memory, it becomes part of a linked list parsed atexit() */

-       lock_file = xmalloc(sizeof(struct lock_file));
+       lock_file = xcalloc(1, sizeof(struct lock_file));

 
        newfd = hold_lock_file_for_update(lock_file, get_index_file());
        if (newfd < 0)
 
        newfd = hold_lock_file_for_update(lock_file, get_index_file());
        if (newfd < 0)

diff --git a/builtin-write-tree.c b/builtin-write-tree.c
index c3aac36024626b31a60baa52f9e596169024b03a..70e9b6fcc6d93e9b869a0a1eac144cbea3ecba3f 100644 (file)
--- a/builtin-write-tree.c
+++ b/builtin-write-tree.c
@@ -16,7 +16,7 @@ int write_tree(unsigned char *sha1, int missing_ok, const char *prefix)
        int entries, was_valid, newfd;
 
        /* We can't free this memory, it becomes part of a linked list parsed atexit() */
        int entries, was_valid, newfd;
 
        /* We can't free this memory, it becomes part of a linked list parsed atexit() */

-       struct lock_file *lock_file = xmalloc(sizeof(struct lock_file));
+       struct lock_file *lock_file = xcalloc(1, sizeof(struct lock_file));

 
        newfd = hold_lock_file_for_update(lock_file, get_index_file());
 
 
        newfd = hold_lock_file_for_update(lock_file, get_index_file());