From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.4 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id AE4671F51C for ; Fri, 18 May 2018 21:24:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751936AbeERVYU (ORCPT ); Fri, 18 May 2018 17:24:20 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:52225 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751768AbeERVYU (ORCPT ); Fri, 18 May 2018 17:24:20 -0400 Received: by mail-wm0-f66.google.com with SMTP id w194-v6so16155884wmf.2 for ; Fri, 18 May 2018 14:24:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5JhP/MpHK/qeX3kms8dhe7IGdo5KyJUWIkUSb6iegm4=; b=Z9RoYuBnL0n9vd3nNsT8xc4a4oYWb46cepMo3FN8o1qgbY6FICTRSibwAMT3DD4G9y 5IpUn4pWwVaMkgXiTYCXdKWIqdwBc0rYzdsr8V3jkcWrduisg6s8+OHxtkxr7nengKa3 F3eLUjh7wKG4TQUkfO2+E7phZtLmuMuHG7on8s4hUNMEF24XYumofuHaogI0IzKtSRSp fiNqfY/qPNt4MOmtY/FSWNk5lPBiwNQe+w4Okjn4EvHacX66MTUXz2tiE6ytAy3VTm8r hzbvTwqfROWIXNtFk0iAYwHwwdFZv0Tj5zA68WqtRGTI5HcYFe0/mYQI5GyoBnmnEeaB ooaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5JhP/MpHK/qeX3kms8dhe7IGdo5KyJUWIkUSb6iegm4=; b=HFvmUl7Vgm8mWImQtbKRz5rNYS7iCeBCztJPJCKpccnZgIPNOf/cnuGtrjNwGcNsMr 2L+heGg5cVN62iXZfCwfqpIIChcKsZOZxoPB+xJHVpMmIQj+ZmoGYLAlwKr30itwPE3g ymedLBIpixiS5PYcUQs5Ko3+KeW0PH3l5Q5AtVOXyNvbLg8BDUKIBN8ha6bQ9jtU1lOq sNslkZBXySwQA8p1onE7IA3e5XZxNV81VXG0NzJGO0A6s0ZIWV6DzGUiRSXqr1EVdRbZ iTWHn50vY85TW9JXErfh91qEJN+F9wdbbibAALOpHQRZ9FHkJULRc4pLEZo6aCGmOtv+ zmdQ== X-Gm-Message-State: ALKqPweUZjKKEeqpzZqEUXs/KCBBfBuIOFV6FSCDYr26Kt0b3FOpCMk2 wSv/NZVq0oXks0vnbIYvvOwblQOUo60= X-Google-Smtp-Source: AB8JxZpa0Zm+mSPsQtRJT4h+9LM9pbhb9QulI/9lssYteMBbAP5ONrfVWFFdquLfNWV6xIAMCKxALA== X-Received: by 2002:a1c:6741:: with SMTP id b62-v6mr5533776wmc.0.1526678658100; Fri, 18 May 2018 14:24:18 -0700 (PDT) Received: from localhost.localdomain ([2a02:aa16:5782:c100:c938:fbb7:46f8:2405]) by smtp.gmail.com with ESMTPSA id u35-v6sm10969192wrc.29.2018.05.18.14.24.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 18 May 2018 14:24:17 -0700 (PDT) From: =?UTF-8?q?Martin=20=C3=85gren?= To: git@vger.kernel.org Cc: Elijah Newren , Ben Peart , Jacob Keller , Phillip Wood , Johannes Schindelin , Junio C Hamano Subject: [PATCH v3 3/3] unpack_trees_options: free messages when done Date: Fri, 18 May 2018 23:23:27 +0200 Message-Id: X-Mailer: git-send-email 2.17.0.840.g5d83f92caf In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org The strings allocated in `setup_unpack_trees_porcelain()` are never freed. Provide a function `clear_unpack_trees_porcelain()` to do so and call it where we use `setup_unpack_trees_porcelain()`. The only non-trivial user is `unpack_trees_start()`, where we should place the new call in `unpack_trees_finish()`. We keep the string pointers in an array, mixing pointers to static memory and memory that we allocate on the heap. We also keep several copies of the individual pointers. So we need to make sure that we do not free what we must not free and that we do not double-free. Keep the unique, heap-allocated pointers in a separate string list, to make the freeing safe and future-proof. Zero the whole array of string pointers to make sure that we do not leave any dangling pointers. Note that we only take responsibility for the memory allocated in `setup_unpack_trees_porcelain()` and not any other members of the `struct unpack_trees_options`. Helped-by: Junio C Hamano Signed-off-by: Martin Ă…gren --- unpack-trees.h | 6 ++++++ builtin/checkout.c | 1 + merge-recursive.c | 1 + merge.c | 3 +++ unpack-trees.c | 23 +++++++++++++++++++---- 5 files changed, 30 insertions(+), 4 deletions(-) diff --git a/unpack-trees.h b/unpack-trees.h index 41178ada94..5a84123a40 100644 --- a/unpack-trees.h +++ b/unpack-trees.h @@ -33,6 +33,11 @@ enum unpack_trees_error_types { void setup_unpack_trees_porcelain(struct unpack_trees_options *opts, const char *cmd); +/* + * Frees resources allocated by setup_unpack_trees_porcelain(). + */ +void clear_unpack_trees_porcelain(struct unpack_trees_options *opts); + struct unpack_trees_options { unsigned int reset, merge, @@ -57,6 +62,7 @@ struct unpack_trees_options { struct pathspec *pathspec; merge_fn_t fn; const char *msgs[NB_UNPACK_TREES_ERROR_TYPES]; + struct string_list msgs_to_free; /* * Store error messages in an array, each case * corresponding to a error message type diff --git a/builtin/checkout.c b/builtin/checkout.c index b49b582071..5cebe170fc 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -526,6 +526,7 @@ static int merge_working_tree(const struct checkout_opts *opts, init_tree_desc(&trees[1], tree->buffer, tree->size); ret = unpack_trees(2, trees, &topts); + clear_unpack_trees_porcelain(&topts); if (ret == -1) { /* * Unpack couldn't do a trivial merge; either diff --git a/merge-recursive.c b/merge-recursive.c index ddb0fa7369..338f63a952 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -382,6 +382,7 @@ static int unpack_trees_start(struct merge_options *o, static void unpack_trees_finish(struct merge_options *o) { discard_index(&o->orig_index); + clear_unpack_trees_porcelain(&o->unpack_opts); } struct tree *write_tree_from_memory(struct merge_options *o) diff --git a/merge.c b/merge.c index f123658e58..b433291d0c 100644 --- a/merge.c +++ b/merge.c @@ -130,8 +130,11 @@ int checkout_fast_forward(const struct object_id *head, if (unpack_trees(nr_trees, t, &opts)) { rollback_lock_file(&lock_file); + clear_unpack_trees_porcelain(&opts); return -1; } + clear_unpack_trees_porcelain(&opts); + if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK)) return error(_("unable to write new index file")); return 0; diff --git a/unpack-trees.c b/unpack-trees.c index 79fd97074e..60293ff536 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -103,6 +103,8 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts, const char **msgs = opts->msgs; const char *msg; + opts->msgs_to_free.strdup_strings = 0; + if (!strcmp(cmd, "checkout")) msg = advice_commit_before_merge ? _("Your local changes to the following files would be overwritten by checkout:\n%%s" @@ -118,8 +120,9 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts, ? _("Your local changes to the following files would be overwritten by %s:\n%%s" "Please commit your changes or stash them before you %s.") : _("Your local changes to the following files would be overwritten by %s:\n%%s"); - msgs[ERROR_WOULD_OVERWRITE] = msgs[ERROR_NOT_UPTODATE_FILE] = - xstrfmt(msg, cmd, cmd); + msg = xstrfmt(msg, cmd, cmd); + msgs[ERROR_WOULD_OVERWRITE] = msgs[ERROR_NOT_UPTODATE_FILE] = msg; + string_list_append(&opts->msgs_to_free, msg); msgs[ERROR_NOT_UPTODATE_DIR] = _("Updating the following directories would lose untracked files in them:\n%s"); @@ -139,7 +142,9 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts, ? _("The following untracked working tree files would be removed by %s:\n%%s" "Please move or remove them before you %s.") : _("The following untracked working tree files would be removed by %s:\n%%s"); - msgs[ERROR_WOULD_LOSE_UNTRACKED_REMOVED] = xstrfmt(msg, cmd, cmd); + msg = xstrfmt(msg, cmd, cmd); + msgs[ERROR_WOULD_LOSE_UNTRACKED_REMOVED] = msg; + string_list_append(&opts->msgs_to_free, msg); if (!strcmp(cmd, "checkout")) msg = advice_commit_before_merge @@ -156,7 +161,9 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts, ? _("The following untracked working tree files would be overwritten by %s:\n%%s" "Please move or remove them before you %s.") : _("The following untracked working tree files would be overwritten by %s:\n%%s"); - msgs[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN] = xstrfmt(msg, cmd, cmd); + msg = xstrfmt(msg, cmd, cmd); + msgs[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN] = msg; + string_list_append(&opts->msgs_to_free, msg); /* * Special case: ERROR_BIND_OVERLAP refers to a pair of paths, we @@ -179,6 +186,14 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts, opts->unpack_rejects[i].strdup_strings = 1; } +void clear_unpack_trees_porcelain(struct unpack_trees_options *opts) +{ + opts->msgs_to_free.strdup_strings = 1; + string_list_clear(&opts->msgs_to_free, 0); + + memset(opts->msgs, 0, sizeof(opts->msgs)); +} + static int do_add_entry(struct unpack_trees_options *o, struct cache_entry *ce, unsigned int set, unsigned int clear) { -- 2.17.0.840.g5d83f92caf