From: "Martin Ågren" <martin.agren@gmail.com>
To: git@vger.kernel.org
Cc: Michael Haggerty <mhagger@alum.mit.edu>
Subject: [PATCH 1/2] refs/files-backend: duplicate strings added to affected_refnames
Date: Fri, 25 Aug 2017 20:49:15 +0200 [thread overview]
Message-ID: <40c5e954dd84ff42552bccfea00144eecdbd1c7e.1503496797.git.martin.agren@gmail.com> (raw)
files_transaction_prepare() and the functions it calls add strings to a
string list without duplicating them, i.e., we keep the original raw
pointers we were given. That is "ok", since we keep them only for a
short-enough time, but we end up leaking some of them.
Switch to duplicating the strings, so that affected_refnames does not
leak memory. The original strings might still leak, but at least that
can now be addressed without worrying about these pointers.
No-one takes any pointers to the strings in the list (it is basically
only used to check for set membership), so it is ok for
string_list_clear to free them.
Signed-off-by: Martin Ågren <martin.agren@gmail.com>
---
refs/files-backend.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/refs/files-backend.c b/refs/files-backend.c
index 5cca55510..22daca2ba 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -2407,7 +2407,7 @@ static int files_transaction_prepare(struct ref_store *ref_store,
"ref_transaction_prepare");
size_t i;
int ret = 0;
- struct string_list affected_refnames = STRING_LIST_INIT_NODUP;
+ struct string_list affected_refnames = STRING_LIST_INIT_DUP;
char *head_ref = NULL;
int head_type;
struct object_id head_oid;
--
2.14.1.151.g45c1275a3.dirty
next reply other threads:[~2017-08-25 18:49 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-25 18:49 Martin Ågren [this message]
2017-08-25 18:49 ` [PATCH 2/2] refs/files-backend: fix memory leak in lock_ref_for_update Martin Ågren
2017-08-25 21:00 ` [PATCH 1/2] refs/files-backend: duplicate strings added to affected_refnames Junio C Hamano
2017-08-26 10:16 ` Martin Ågren
2017-08-28 8:06 ` Michael Haggerty
2017-08-28 10:09 ` Martin Ågren
2017-08-28 20:32 ` [PATCH v2 1/2] refs/files-backend: add longer-scoped copy of string to list Martin Ågren
2017-08-29 8:33 ` Michael Haggerty
2017-08-28 20:32 ` [PATCH v2 2/2] refs/files-backend: fix memory leak in lock_ref_for_update Martin Ågren
2017-08-29 8:39 ` Michael Haggerty
2017-08-29 10:41 ` Martin Ågren
2017-08-29 17:18 ` [PATCH v3 1/3] refs/files-backend: add longer-scoped copy of string to list Martin Ågren
2017-08-30 2:52 ` Michael Haggerty
2017-08-30 18:02 ` Martin Ågren
2017-09-05 10:02 ` Junio C Hamano
2017-09-05 17:24 ` Martin Ågren
2017-09-05 20:36 ` Jeff King
2017-09-05 21:26 ` Junio C Hamano
2017-09-06 18:12 ` Martin Ågren
2017-09-06 19:52 ` Junio C Hamano
2017-09-06 23:45 ` Jeff King
2017-09-09 6:57 ` [PATCH v4 0/4] Rerolling ma/split-symref-update-fix Martin Ågren
2017-09-09 6:57 ` [PATCH v4 1/4] refs/files-backend: add longer-scoped copy of string to list Martin Ågren
2017-09-09 6:57 ` [PATCH v4 2/4] refs/files-backend: fix memory leak in lock_ref_for_update Martin Ågren
2017-09-09 6:57 ` [PATCH v4 3/4] refs/files-backend: correct return value " Martin Ågren
2017-09-09 6:57 ` [PATCH v4 4/4] refs/files-backend: add `refname`, not "HEAD", to list Martin Ågren
2017-09-09 10:47 ` [PATCH v4 0/4] Rerolling ma/split-symref-update-fix Jeff King
2017-09-05 8:45 ` [PATCH v3 1/3] refs/files-backend: add longer-scoped copy of string to list Jeff King
2017-09-05 9:03 ` Michael Haggerty
2017-09-05 9:04 ` Jeff King
2017-08-29 17:18 ` [PATCH v3 2/3] refs/files-backend: fix memory leak in lock_ref_for_update Martin Ågren
2017-09-05 8:47 ` Jeff King
2017-09-05 17:28 ` Martin Ågren
2017-08-29 17:18 ` [PATCH v3 3/3] refs/files-backend: correct return value " 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=40c5e954dd84ff42552bccfea00144eecdbd1c7e.1503496797.git.martin.agren@gmail.com \
--to=martin.agren@gmail.com \
--cc=git@vger.kernel.org \
--cc=mhagger@alum.mit.edu \
/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).