From: Derrick Stolee <stolee@gmail.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Derrick Stolee" <dstolee@microsoft.com>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>,
"jnareb@gmail.com" <jnareb@gmail.com>,
"marten.agren@gmail.com" <marten.agren@gmail.com>,
"gitster@pobox.com" <gitster@pobox.com>
Subject: Re: [PATCH v5 18/21] commit-graph: use string-list API for input
Date: Wed, 6 Jun 2018 08:15:04 -0400 [thread overview]
Message-ID: <aa4c3a93-0c63-f424-db0b-0e451bbaa91e@gmail.com> (raw)
In-Reply-To: <87h8mgyv0f.fsf@evledraar.gmail.com>
On 6/6/2018 8:11 AM, Ævar Arnfjörð Bjarmason wrote:
> On Wed, Jun 06 2018, Derrick Stolee wrote:
>
>> Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
>> ---
>> builtin/commit-graph.c | 39 +++++++++++++--------------------------
>> commit-graph.c | 15 +++++++--------
>> commit-graph.h | 7 +++----
>> 3 files changed, 23 insertions(+), 38 deletions(-)
>> diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c
>> index 3079cde6f9..d8eb8278b3 100644
>> --- a/builtin/commit-graph.c
>> +++ b/builtin/commit-graph.c
>> @@ -118,13 +118,9 @@ static int graph_read(int argc, const char **argv)
>>
>> static int graph_write(int argc, const char **argv)
>> {
>> - const char **pack_indexes = NULL;
>> - int packs_nr = 0;
>> - const char **commit_hex = NULL;
>> - int commits_nr = 0;
>> - const char **lines = NULL;
>> - int lines_nr = 0;
>> - int lines_alloc = 0;
>> + struct string_list *pack_indexes = NULL;
>> + struct string_list *commit_hex = NULL;
>> + struct string_list lines;
>>
>> static struct option builtin_commit_graph_write_options[] = {
>> OPT_STRING(0, "object-dir", &opts.obj_dir,
>> @@ -150,32 +146,23 @@ static int graph_write(int argc, const char **argv)
>>
>> if (opts.stdin_packs || opts.stdin_commits) {
>> struct strbuf buf = STRBUF_INIT;
>> - lines_nr = 0;
>> - lines_alloc = 128;
>> - ALLOC_ARRAY(lines, lines_alloc);
>> -
>> - while (strbuf_getline(&buf, stdin) != EOF) {
>> - ALLOC_GROW(lines, lines_nr + 1, lines_alloc);
>> - lines[lines_nr++] = strbuf_detach(&buf, NULL);
>> - }
>> -
>> - if (opts.stdin_packs) {
>> - pack_indexes = lines;
>> - packs_nr = lines_nr;
>> - }
>> - if (opts.stdin_commits) {
>> - commit_hex = lines;
>> - commits_nr = lines_nr;
>> - }
>> + string_list_init(&lines, 0);
>> +
>> + while (strbuf_getline(&buf, stdin) != EOF)
>> + string_list_append(&lines, strbuf_detach(&buf, NULL));
>> +
>> + if (opts.stdin_packs)
>> + pack_indexes = &lines;
>> + if (opts.stdin_commits)
>> + commit_hex = &lines;
>> }
>>
>> write_commit_graph(opts.obj_dir,
>> pack_indexes,
>> - packs_nr,
>> commit_hex,
>> - commits_nr,
>> opts.append);
>>
>> + string_list_clear(&lines, 0);
>> return 0;
>> }
> This results in an invalid free() & segfault because you're freeing
> &lines which may not have been allocated by string_list_init().
Good point. Did my tests not catch this? (seems it requires calling `git
commit-graph write` with no `--stdin-packs` or `--stdin-commits`).
>
> Monkeypatch on top which I used to fix it:
>
> diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c
> index 76423b3fa5..c7eb68aa3a 100644
> --- a/builtin/commit-graph.c
> +++ b/builtin/commit-graph.c
> @@ -122,6 +122,7 @@ static int graph_write(int argc, const char **argv)
> struct string_list *pack_indexes = NULL;
> struct string_list *commit_hex = NULL;
> struct string_list lines;
> + int free_lines = 0;
>
> static struct option builtin_commit_graph_write_options[] = {
> OPT_STRING(0, "object-dir", &opts.obj_dir,
> @@ -155,6 +156,7 @@ static int graph_write(int argc, const char **argv)
> if (opts.stdin_packs || opts.stdin_commits) {
> struct strbuf buf = STRBUF_INIT;
> string_list_init(&lines, 0);
> + free_lines = 1;
>
> while (strbuf_getline(&buf, stdin) != EOF)
> string_list_append(&lines, strbuf_detach(&buf, NULL));
> @@ -170,7 +172,8 @@ static int graph_write(int argc, const char **argv)
> commit_hex,
> opts.append);
>
> - string_list_clear(&lines, 0);
> + if (free_lines)
> + string_list_clear(&lines, 0);
> return 0;
> }
>
> But probably having a pointer to the struct which is NULL etc. is
> better.
Wouldn't the easiest fix be to call `string_list_init(&lines, 0)`
outside of any conditional?
Thanks,
-Stolee
next prev parent reply other threads:[~2018-06-06 12:15 UTC|newest]
Thread overview: 125+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-04 16:52 [PATCH v4 00/21] Integrate commit-graph into 'fsck' and 'gc' Derrick Stolee
2018-06-04 16:52 ` [PATCH v4 01/21] commit-graph: UNLEAK before die() Derrick Stolee
2018-06-04 16:52 ` [PATCH v4 02/21] commit-graph: fix GRAPH_MIN_SIZE Derrick Stolee
2018-06-04 16:52 ` [PATCH v4 03/21] commit-graph: parse commit from chosen graph Derrick Stolee
2018-06-04 16:52 ` [PATCH v4 04/21] commit: force commit to parse from object database Derrick Stolee
2018-06-04 16:52 ` [PATCH v4 05/21] commit-graph: load a root tree from specific graph Derrick Stolee
2018-06-04 16:52 ` [PATCH v4 06/21] commit-graph: add 'verify' subcommand Derrick Stolee
2018-06-04 16:52 ` [PATCH v4 07/21] commit-graph: verify catches corrupt signature Derrick Stolee
2018-06-04 16:52 ` [PATCH v4 08/21] commit-graph: verify required chunks are present Derrick Stolee
2018-06-04 16:52 ` [PATCH v4 09/21] commit-graph: verify corrupt OID fanout and lookup Derrick Stolee
2018-06-04 16:52 ` [PATCH v4 10/21] commit-graph: verify objects exist Derrick Stolee
2018-06-04 16:52 ` [PATCH v4 11/21] commit-graph: verify root tree OIDs Derrick Stolee
2018-06-04 16:52 ` [PATCH v4 12/21] commit-graph: verify parent list Derrick Stolee
2018-06-04 16:52 ` [PATCH v4 13/21] commit-graph: verify generation number Derrick Stolee
2018-06-04 16:52 ` [PATCH v4 14/21] commit-graph: verify commit date Derrick Stolee
2018-06-04 16:52 ` [PATCH v4 15/21] commit-graph: test for corrupted octopus edge Derrick Stolee
2018-06-04 16:52 ` [PATCH v4 16/21] commit-graph: verify contents match checksum Derrick Stolee
2018-06-04 16:52 ` [PATCH v4 17/21] fsck: verify commit-graph Derrick Stolee
2018-06-06 11:08 ` Ævar Arnfjörð Bjarmason
2018-06-06 11:31 ` Derrick Stolee
2018-06-04 16:52 ` [PATCH v4 18/21] commit-graph: use string-list API for input Derrick Stolee
2018-06-04 16:52 ` [PATCH v4 19/21] commit-graph: add '--reachable' option Derrick Stolee
2018-06-04 16:53 ` [PATCH v4 20/21] gc: automatically write commit-graph files Derrick Stolee
2018-06-06 11:11 ` Ævar Arnfjörð Bjarmason
2018-06-04 16:53 ` [PATCH v4 21/21] commit-graph: update design document Derrick Stolee
2018-06-04 17:02 ` [PATCH v4 00/21] Integrate commit-graph into 'fsck' and 'gc' Derrick Stolee
2018-06-05 14:51 ` Ævar Arnfjörð Bjarmason
2018-06-05 16:37 ` Derrick Stolee
2018-06-06 11:36 ` [PATCH v5 " Derrick Stolee
2018-06-06 11:36 ` [PATCH v5 01/21] commit-graph: UNLEAK before die() Derrick Stolee
2018-06-06 11:36 ` [PATCH v5 03/21] commit-graph: parse commit from chosen graph Derrick Stolee
2018-06-06 11:36 ` [PATCH v5 02/21] commit-graph: fix GRAPH_MIN_SIZE Derrick Stolee
2018-06-06 11:36 ` [PATCH v5 04/21] commit: force commit to parse from object database Derrick Stolee
2018-06-06 11:36 ` [PATCH v5 05/21] commit-graph: load a root tree from specific graph Derrick Stolee
2018-06-06 11:36 ` [PATCH v5 06/21] commit-graph: add 'verify' subcommand Derrick Stolee
2018-06-06 11:36 ` [PATCH v5 07/21] commit-graph: verify catches corrupt signature Derrick Stolee
2018-06-06 11:36 ` [PATCH v5 08/21] commit-graph: verify required chunks are present Derrick Stolee
2018-06-06 12:21 ` Ævar Arnfjörð Bjarmason
2018-06-06 11:36 ` [PATCH v5 09/21] commit-graph: verify corrupt OID fanout and lookup Derrick Stolee
2018-06-06 11:36 ` [PATCH v5 10/21] commit-graph: verify objects exist Derrick Stolee
2018-06-06 11:36 ` [PATCH v5 11/21] commit-graph: verify root tree OIDs Derrick Stolee
2018-06-06 11:36 ` [PATCH v5 12/21] commit-graph: verify parent list Derrick Stolee
2018-06-06 11:36 ` [PATCH v5 13/21] commit-graph: verify generation number Derrick Stolee
2018-06-06 11:36 ` [PATCH v5 14/21] commit-graph: verify commit date Derrick Stolee
2018-06-06 11:36 ` [PATCH v5 15/21] commit-graph: test for corrupted octopus edge Derrick Stolee
2018-06-06 11:36 ` [PATCH v5 16/21] commit-graph: verify contents match checksum Derrick Stolee
2018-06-06 11:36 ` [PATCH v5 17/21] fsck: verify commit-graph Derrick Stolee
2018-06-06 11:36 ` [PATCH v5 18/21] commit-graph: use string-list API for input Derrick Stolee
2018-06-06 12:11 ` Ævar Arnfjörð Bjarmason
2018-06-06 12:15 ` Derrick Stolee [this message]
2018-06-06 12:26 ` Ævar Arnfjörð Bjarmason
2018-06-06 12:45 ` Derrick Stolee
2018-06-08 12:48 ` Derrick Stolee
2018-06-06 11:36 ` [PATCH v5 19/21] commit-graph: add '--reachable' option Derrick Stolee
2018-06-06 11:36 ` [PATCH v5 20/21] gc: automatically write commit-graph files Derrick Stolee
2018-06-06 11:36 ` [PATCH v5 21/21] commit-graph: update design document Derrick Stolee
2018-06-08 13:56 ` [PATCH v6 00/21] Integrate commit-graph into 'fsck' and 'gc' Derrick Stolee
2018-06-08 13:56 ` [PATCH v6 01/21] commit-graph: UNLEAK before die() Derrick Stolee
2018-06-08 13:56 ` [PATCH v6 02/21] commit-graph: fix GRAPH_MIN_SIZE Derrick Stolee
2018-06-08 13:56 ` [PATCH v6 03/21] commit-graph: parse commit from chosen graph Derrick Stolee
2018-06-08 13:56 ` [PATCH v6 04/21] commit: force commit to parse from object database Derrick Stolee
2018-06-08 13:56 ` [PATCH v6 05/21] commit-graph: load a root tree from specific graph Derrick Stolee
2018-06-08 13:56 ` [PATCH v6 06/21] commit-graph: add 'verify' subcommand Derrick Stolee
2018-06-08 13:56 ` [PATCH v6 07/21] commit-graph: verify catches corrupt signature Derrick Stolee
2018-06-08 13:56 ` [PATCH v6 08/21] commit-graph: verify required chunks are present Derrick Stolee
2018-06-08 13:56 ` [PATCH v6 09/21] commit-graph: verify corrupt OID fanout and lookup Derrick Stolee
2018-06-08 13:56 ` [PATCH v6 10/21] commit-graph: verify objects exist Derrick Stolee
2018-06-08 13:56 ` [PATCH v6 12/21] commit-graph: verify parent list Derrick Stolee
2018-06-12 16:55 ` Junio C Hamano
2018-06-08 13:56 ` [PATCH v6 11/21] commit-graph: verify root tree OIDs Derrick Stolee
2018-06-08 13:56 ` [PATCH v6 13/21] commit-graph: verify generation number Derrick Stolee
2018-06-08 13:56 ` [PATCH v6 14/21] commit-graph: verify commit date Derrick Stolee
2018-06-08 13:56 ` [PATCH v6 15/21] commit-graph: test for corrupted octopus edge Derrick Stolee
2018-06-08 13:56 ` [PATCH v6 16/21] commit-graph: verify contents match checksum Derrick Stolee
2018-06-08 13:56 ` [PATCH v6 17/21] fsck: verify commit-graph Derrick Stolee
2018-06-08 13:56 ` [PATCH v6 18/21] commit-graph: use string-list API for input Derrick Stolee
2018-06-08 13:56 ` [PATCH v6 19/21] commit-graph: add '--reachable' option Derrick Stolee
2018-06-08 13:56 ` [PATCH v6 20/21] gc: automatically write commit-graph files Derrick Stolee
2018-06-08 22:24 ` SZEDER Gábor
2018-06-25 14:48 ` Derrick Stolee
2018-06-08 13:56 ` [PATCH v6 21/21] commit-graph: update design document Derrick Stolee
2018-06-08 15:05 ` [PATCH v6 00/21] Integrate commit-graph into 'fsck' and 'gc' Jakub Narębski
2018-06-08 15:11 ` Derrick Stolee
2018-06-27 13:24 ` [PATCH v7 00/22] " Derrick Stolee
2018-06-27 13:24 ` [PATCH v7 01/22] t5318-commit-graph.sh: use core.commitGraph Derrick Stolee
2018-06-27 17:38 ` Junio C Hamano
2018-06-27 13:24 ` [PATCH v7 02/22] commit-graph: UNLEAK before die() Derrick Stolee
2018-06-27 13:24 ` [PATCH v7 03/22] commit-graph: fix GRAPH_MIN_SIZE Derrick Stolee
2018-06-27 13:24 ` [PATCH v7 04/22] commit-graph: parse commit from chosen graph Derrick Stolee
2018-06-27 13:24 ` [PATCH v7 05/22] commit: force commit to parse from object database Derrick Stolee
2018-06-27 13:24 ` [PATCH v7 06/22] commit-graph: load a root tree from specific graph Derrick Stolee
2018-07-11 9:38 ` SZEDER Gábor
2018-07-13 16:30 ` [PATCH] coccinelle: update commit.cocci Derrick Stolee
2018-07-13 17:45 ` Eric Sunshine
2018-06-27 13:24 ` [PATCH v7 07/22] commit-graph: add 'verify' subcommand Derrick Stolee
2018-06-27 21:59 ` Jonathan Tan
2018-06-29 12:47 ` Derrick Stolee
2018-06-27 13:24 ` [PATCH v7 08/22] commit-graph: verify catches corrupt signature Derrick Stolee
2018-06-27 13:24 ` [PATCH v7 09/22] commit-graph: verify required chunks are present Derrick Stolee
2018-06-27 13:24 ` [PATCH v7 10/22] commit-graph: verify corrupt OID fanout and lookup Derrick Stolee
2018-06-27 13:24 ` [PATCH v7 11/22] commit-graph: verify objects exist Derrick Stolee
2018-06-27 13:24 ` [PATCH v7 12/22] commit-graph: verify root tree OIDs Derrick Stolee
2018-06-27 13:24 ` [PATCH v7 13/22] commit-graph: verify parent list Derrick Stolee
2018-06-27 13:24 ` [PATCH v7 14/22] commit-graph: verify generation number Derrick Stolee
2018-06-27 13:24 ` [PATCH v7 15/22] commit-graph: verify commit date Derrick Stolee
2018-06-27 13:24 ` [PATCH v7 16/22] commit-graph: test for corrupted octopus edge Derrick Stolee
2018-06-27 13:24 ` [PATCH v7 17/22] commit-graph: verify contents match checksum Derrick Stolee
2018-06-27 17:51 ` Junio C Hamano
2018-06-27 13:24 ` [PATCH v7 18/22] fsck: verify commit-graph Derrick Stolee
2018-06-27 13:24 ` [PATCH v7 19/22] commit-graph: use string-list API for input Derrick Stolee
2018-06-27 13:24 ` [PATCH v7 20/22] commit-graph: add '--reachable' option Derrick Stolee
2018-06-27 17:53 ` Junio C Hamano
2018-09-11 5:22 ` Christian Couder
2018-09-11 11:19 ` Derrick Stolee
2018-09-11 15:13 ` Christian Couder
2018-06-27 13:24 ` [PATCH v7 21/22] gc: automatically write commit-graph files Derrick Stolee
2018-06-27 18:09 ` Junio C Hamano
2018-06-27 18:24 ` Derrick Stolee
2018-08-03 9:39 ` SZEDER Gábor
2018-08-12 20:18 ` [PATCH] t5318: use 'test_cmp_bin' to compare " SZEDER Gábor
2018-08-13 11:24 ` Derrick Stolee
2018-08-13 11:41 ` SZEDER Gábor
2018-08-13 11:52 ` [PATCH v2] " SZEDER Gábor
2018-06-27 13:24 ` [PATCH v7 22/22] commit-graph: update design document Derrick Stolee
2018-06-27 18:09 ` Junio C Hamano
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=aa4c3a93-0c63-f424-db0b-0e451bbaa91e@gmail.com \
--to=stolee@gmail.com \
--cc=avarab@gmail.com \
--cc=dstolee@microsoft.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jnareb@gmail.com \
--cc=marten.agren@gmail.com \
/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).