From: "Martin Ågren" <martin.agren@gmail.com>
To: git@vger.kernel.org
Cc: Jeff King <peff@peff.net>,
"brian m . carlson" <sandals@crustytoothpaste.net>
Subject: [PATCH v4 0/2] setup: fix memory leaks with `struct repository_format`
Date: Thu, 28 Feb 2019 21:36:26 +0100 [thread overview]
Message-ID: <cover.1551385992.git.martin.agren@gmail.com> (raw)
In-Reply-To: <20190226174655.GE19606@sigill.intra.peff.net>
This is a follow-up to v3 [1] from about a month ago. Patch 1 is
unchanged; patch 2 provides some additional documentation of the
initialization that is required, plus I've gotten rid of the compound
literal. Range-diff below.
Thanks Peff and brian for very helpful comments and discussion.
Martin
[1] https://public-inbox.org/git/cover.1548186510.git.martin.agren@gmail.com/
Martin Ågren (2):
setup: free old value before setting `work_tree`
setup: fix memory leaks with `struct repository_format`
cache.h | 31 ++++++++++++++++++++++++++++---
builtin/init-db.c | 3 ++-
repository.c | 3 ++-
setup.c | 40 ++++++++++++++++++++++++++++------------
worktree.c | 4 +++-
5 files changed, 63 insertions(+), 18 deletions(-)
Range-diff against v3:
1: 13019979b8 = 1: 13019979b8 setup: free old value before setting `work_tree`
2: e0c4a73119 ! 2: b21704c1e4 setup: fix memory leaks with `struct repository_format`
@@ -16,15 +16,16 @@
they take from it, rather than stealing the pointers.
Call `clear_...()` at the start of `read_...()` instead of just zeroing
- the struct, since we sometimes enter the function multiple times. This
- means that it is important to initialize the struct before calling
- `read_...()`, so document that. Teach `read_...()` to clear the struct
- upon an error, so that it is reset to a safe state, and document this.
+ the struct, since we sometimes enter the function multiple times. Thus,
+ it is important to initialize the struct before calling `read_...()`, so
+ document that. It's also important because we might not even call
+ `read_...()` before we call `clear_...()`, see, e.g., builtin/init-db.c.
- About that very last point: In `setup_git_directory_gently()`, we look
- at `repo_fmt.hash_algo` even if `repo_fmt.version` is -1, which we
+ Teach `read_...()` to clear the struct on error, so that it is reset to
+ a safe state, and document this. (In `setup_git_directory_gently()`, we
+ look at `repo_fmt.hash_algo` even if `repo_fmt.version` is -1, which we
weren't actually supposed to do per the API. After this commit, that's
- ok.
+ ok.)
We inherit the existing code's combining "error" and "no version found".
Both are signalled through `version == -1` and now both cause us to
@@ -34,11 +35,21 @@
non-negative version number before using them.
Signed-off-by: Martin Ågren <martin.agren@gmail.com>
- Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/cache.h b/cache.h
--- a/cache.h
+++ b/cache.h
+@@
+ extern const char *core_partial_clone_filter_default;
+ extern int repository_format_worktree_config;
+
++/*
++ * You _have_ to initialize a `struct repository_format` using
++ * `= REPOSITORY_FORMAT_INIT` before calling `read_repository_format()`.
++ */
+ struct repository_format {
+ int version;
+ int precious_objects;
@@
struct string_list unknown_extensions;
};
@@ -146,8 +157,15 @@
}
return 0;
-@@
+ }
++static void init_repository_format(struct repository_format *format)
++{
++ const struct repository_format fresh = REPOSITORY_FORMAT_INIT;
++
++ memcpy(format, &fresh, sizeof(fresh));
++}
++
int read_repository_format(struct repository_format *format, const char *path)
{
- memset(format, 0, sizeof(*format));
@@ -167,7 +185,7 @@
+ string_list_clear(&format->unknown_extensions, 0);
+ free(format->work_tree);
+ free(format->partial_clone);
-+ *format = (struct repository_format)REPOSITORY_FORMAT_INIT;
++ init_repository_format(format);
+}
+
int verify_repository_format(const struct repository_format *format,
--
2.21.0
next prev parent reply other threads:[~2019-02-28 20:36 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-18 7:25 [PATCH 0/3] setup: add `clear_repository_format()` Martin Ågren
2018-12-18 7:25 ` [PATCH 1/3] setup: drop return value from `read_repository_format()` Martin Ågren
2018-12-19 15:27 ` Jeff King
2018-12-19 21:42 ` Martin Ågren
2018-12-20 0:17 ` brian m. carlson
2018-12-20 2:52 ` Jeff King
2018-12-20 3:45 ` brian m. carlson
2018-12-20 14:53 ` Jeff King
2018-12-18 7:25 ` [PATCH 2/3] setup: do not use invalid `repository_format` Martin Ågren
2018-12-19 0:18 ` brian m. carlson
2018-12-19 21:43 ` Martin Ågren
2018-12-19 15:38 ` Jeff King
2018-12-19 21:46 ` Martin Ågren
2018-12-19 23:17 ` Jeff King
2018-12-20 0:21 ` brian m. carlson
2018-12-18 7:25 ` [PATCH 3/3] setup: add `clear_repository_format()` Martin Ågren
2018-12-19 15:48 ` Jeff King
2018-12-19 21:49 ` Martin Ågren
2019-01-14 18:34 ` [PATCH v2 0/3] " Martin Ågren
2019-01-14 18:34 ` [PATCH v2 1/3] setup: free old value before setting `work_tree` Martin Ågren
2019-01-14 18:34 ` [PATCH v2 2/3] setup: do not use invalid `repository_format` Martin Ågren
2019-01-15 19:31 ` Jeff King
2019-01-17 6:31 ` Martin Ågren
2019-01-22 7:07 ` Jeff King
2019-01-22 13:34 ` Martin Ågren
2019-01-22 21:45 ` [PATCH v3 0/2] setup: fix memory leaks with `struct repository_format` Martin Ågren
2019-01-22 21:45 ` [PATCH v3 1/2] setup: free old value before setting `work_tree` Martin Ågren
2019-01-22 21:45 ` [PATCH v3 2/2] setup: fix memory leaks with `struct repository_format` Martin Ågren
2019-01-23 5:57 ` Jeff King
2019-01-24 0:14 ` brian m. carlson
2019-01-25 19:25 ` Martin Ågren
2019-01-25 19:24 ` Martin Ågren
2019-01-25 19:51 ` Jeff King
2019-02-25 19:21 ` Martin Ågren
2019-02-26 17:46 ` Jeff King
2019-02-28 20:36 ` Martin Ågren [this message]
2019-02-28 20:36 ` [PATCH v4 1/2] setup: free old value before setting `work_tree` Martin Ågren
2019-02-28 20:36 ` [PATCH v4 2/2] setup: fix memory leaks with `struct repository_format` Martin Ågren
2019-03-06 4:56 ` [PATCH v4 0/2] " Jeff King
2019-01-14 18:34 ` [PATCH v2 3/3] setup: add `clear_repository_format()` Martin Ågren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cover.1551385992.git.martin.agren@gmail.com \
--to=martin.agren@gmail.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=sandals@crustytoothpaste.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).