diff options
| author | Jeff King <peff@peff.net> | 2017-09-05 08:15:21 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-06 17:19:54 +0900 |
| commit | bfffb48c5d520a5f181716b0330774a03cd3fa39 (patch) | |
| tree | 78488ee47fe26a6f3c1592c69402ba36f7661792 /cache-tree.c | |
| parent | ee4d8e455c0981269213eccfd788a9bb9adf77d9 (diff) | |
| download | git-bfffb48c5d520a5f181716b0330774a03cd3fa39.tar.gz | |
stop leaking lock structs in some simple casesjk/incore-lockfile-removal
Now that it's safe to declare a "struct lock_file" on the
stack, we can do so (and avoid an intentional leak). These
leaks were found by running t0000 and t0001 under valgrind
(though certainly other similar leaks exist and just don't
happen to be exercised by those tests).
Initializing the lock_file's inner tempfile with NULL is not
strictly necessary in these cases, but it's a good practice
to model. It means that if we were to call a function like
rollback_lock_file() on a lock that was never taken in the
first place, it becomes a quiet noop (rather than undefined
behavior).
Likewise, it's always safe to rollback_lock_file() on a file
that has already been committed or deleted, since that
operation is a noop on an inactive lockfile (and that's why
the case in config.c can drop the "if (lock)" check as we
move away from using a pointer).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'cache-tree.c')
| -rw-r--r-- | cache-tree.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/cache-tree.c b/cache-tree.c index 2690113a6a..71d092ed51 100644 --- a/cache-tree.c +++ b/cache-tree.c @@ -603,16 +603,10 @@ static struct cache_tree *cache_tree_find(struct cache_tree *it, const char *pat int write_index_as_tree(unsigned char *sha1, struct index_state *index_state, const char *index_path, int flags, const char *prefix) { int entries, was_valid, newfd; - struct lock_file *lock_file; + struct lock_file lock_file = LOCK_INIT; int ret = 0; - /* - * We can't free this memory, it becomes part of a linked list - * parsed atexit() - */ - lock_file = xcalloc(1, sizeof(struct lock_file)); - - newfd = hold_lock_file_for_update(lock_file, index_path, LOCK_DIE_ON_ERROR); + newfd = hold_lock_file_for_update(&lock_file, index_path, LOCK_DIE_ON_ERROR); entries = read_index_from(index_state, index_path); if (entries < 0) { @@ -632,7 +626,7 @@ int write_index_as_tree(unsigned char *sha1, struct index_state *index_state, co goto out; } if (0 <= newfd) { - if (!write_locked_index(index_state, lock_file, COMMIT_LOCK)) + if (!write_locked_index(index_state, &lock_file, COMMIT_LOCK)) newfd = -1; } /* Not being able to write is fine -- we are only interested @@ -657,7 +651,7 @@ int write_index_as_tree(unsigned char *sha1, struct index_state *index_state, co out: if (0 <= newfd) - rollback_lock_file(lock_file); + rollback_lock_file(&lock_file); return ret; } |