From: Brandon Williams <bmwill@google.com>
To: git@vger.kernel.org
Cc: Brandon Williams <bmwill@google.com>,
sbeller@google.com, pclouds@gmail.com, gitster@pobox.com
Subject: [PATCH v3 06/16] pathspec: copy and free owned memory
Date: Tue, 13 Dec 2016 15:14:20 -0800 [thread overview]
Message-ID: <1481670870-66754-7-git-send-email-bmwill@google.com> (raw)
In-Reply-To: <1481670870-66754-1-git-send-email-bmwill@google.com>
The 'original' string entry in a pathspec_item is only duplicated some
of the time, instead always make a copy of the original and take
ownership of the memory.
Since both 'match' and 'original' string entries in a pathspec_item are
owned by the pathspec struct, they need to be freed when clearing the
pathspec struct (in 'clear_pathspec()') and duplicated when copying the
pathspec struct (in 'copy_pathspec()').
Also change the type of 'match' and 'original' to 'char *' in order to
more explicitly show the ownership of the memory.
Signed-off-by: Brandon Williams <bmwill@google.com>
---
pathspec.c | 22 ++++++++++++++++++----
pathspec.h | 4 ++--
2 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/pathspec.c b/pathspec.c
index 1f918cb..8f367f0 100644
--- a/pathspec.c
+++ b/pathspec.c
@@ -259,8 +259,9 @@ static unsigned prefix_pathspec(struct pathspec_item *item,
}
strbuf_addstr(&sb, match);
item->original = strbuf_detach(&sb, NULL);
- } else
- item->original = elt;
+ } else {
+ item->original = xstrdup(elt);
+ }
item->len = strlen(item->match);
item->prefix = prefixlen;
@@ -388,8 +389,8 @@ void parse_pathspec(struct pathspec *pathspec,
die("BUG: PATHSPEC_PREFER_CWD requires arguments");
pathspec->items = item = xcalloc(1, sizeof(*item));
- item->match = prefix;
- item->original = prefix;
+ item->match = xstrdup(prefix);
+ item->original = xstrdup(prefix);
item->nowildcard_len = item->len = strlen(prefix);
item->prefix = item->len;
pathspec->nr = 1;
@@ -453,13 +454,26 @@ void parse_pathspec(struct pathspec *pathspec,
void copy_pathspec(struct pathspec *dst, const struct pathspec *src)
{
+ int i;
+
*dst = *src;
ALLOC_ARRAY(dst->items, dst->nr);
COPY_ARRAY(dst->items, src->items, dst->nr);
+
+ for (i = 0; i < dst->nr; i++) {
+ dst->items[i].match = xstrdup(src->items[i].match);
+ dst->items[i].original = xstrdup(src->items[i].original);
+ }
}
void clear_pathspec(struct pathspec *pathspec)
{
+ int i;
+
+ for (i = 0; i < pathspec->nr; i++) {
+ free(pathspec->items[i].match);
+ free(pathspec->items[i].original);
+ }
free(pathspec->items);
pathspec->items = NULL;
}
diff --git a/pathspec.h b/pathspec.h
index 70a592e..49fd823 100644
--- a/pathspec.h
+++ b/pathspec.h
@@ -25,8 +25,8 @@ struct pathspec {
unsigned magic;
int max_depth;
struct pathspec_item {
- const char *match;
- const char *original;
+ char *match;
+ char *original;
unsigned magic;
int len, prefix;
int nowildcard_len;
--
2.8.0.rc3.226.g39d4020
next prev parent reply other threads:[~2016-12-13 23:16 UTC|newest]
Thread overview: 142+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-06 21:51 [PATCH 00/17] pathspec cleanup Brandon Williams
2016-12-06 21:51 ` [PATCH 01/17] mv: convert to using pathspec struct interface Brandon Williams
2016-12-07 10:07 ` Duy Nguyen
2016-12-08 0:36 ` Brandon Williams
2016-12-08 11:04 ` Duy Nguyen
2016-12-08 18:06 ` Brandon Williams
2016-12-06 21:51 ` [PATCH 02/17] dir: convert create_simplify to use the " Brandon Williams
2016-12-07 10:17 ` Duy Nguyen
2016-12-08 0:03 ` Brandon Williams
2016-12-08 11:05 ` Duy Nguyen
2016-12-08 18:19 ` Brandon Williams
2016-12-09 13:08 ` Duy Nguyen
2016-12-09 19:23 ` Brandon Williams
2016-12-13 22:49 ` Brandon Williams
2016-12-06 21:51 ` [PATCH 03/17] dir: convert fill_directory " Brandon Williams
2016-12-07 10:24 ` Duy Nguyen
2016-12-07 22:46 ` Brandon Williams
2016-12-06 21:51 ` [PATCH 04/17] ls-tree: convert show_recursive " Brandon Williams
2016-12-07 10:38 ` Duy Nguyen
2016-12-07 22:43 ` Brandon Williams
2016-12-06 21:51 ` [PATCH 05/17] pathspec: remove the deprecated get_pathspec function Brandon Williams
2016-12-06 21:51 ` [PATCH 06/17] pathspec: copy and free owned memory Brandon Williams
2016-12-06 21:51 ` [PATCH 07/17] mv: small code cleanup Brandon Williams
2016-12-06 21:51 ` [PATCH 08/17] pathspec: remove unused variable from unsupported_magic Brandon Williams
2016-12-06 21:51 ` [PATCH 09/17] pathspec: always show mnemonic and name in unsupported_magic Brandon Williams
2016-12-07 10:44 ` Duy Nguyen
2016-12-07 22:41 ` Brandon Williams
2016-12-07 10:47 ` Duy Nguyen
2016-12-07 22:41 ` Brandon Williams
2016-12-06 21:51 ` [PATCH 10/17] pathspec: simpler logic to prefix original pathspec elements Brandon Williams
2016-12-06 22:20 ` Stefan Beller
2016-12-06 22:37 ` Brandon Williams
2016-12-06 21:51 ` [PATCH 11/17] pathspec: factor global magic into its own function Brandon Williams
2016-12-07 12:53 ` Duy Nguyen
2016-12-07 22:39 ` Brandon Williams
2016-12-08 9:20 ` Duy Nguyen
2016-12-06 21:51 ` [PATCH 12/17] pathspec: create parse_short_magic function Brandon Williams
2016-12-06 21:51 ` [PATCH 13/17] pathspec: create parse_long_magic function Brandon Williams
2016-12-06 21:51 ` [PATCH 14/17] pathspec: create parse_element_magic helper Brandon Williams
2016-12-06 21:51 ` [PATCH 15/17] pathspec: create strip submodule slash helpers Brandon Williams
2016-12-06 21:51 ` [PATCH 16/17] pathspec: small readability changes Brandon Williams
2016-12-06 22:30 ` Stefan Beller
2016-12-07 13:00 ` Duy Nguyen
2016-12-07 23:27 ` Brandon Williams
2016-12-08 9:23 ` Duy Nguyen
2016-12-07 13:04 ` Duy Nguyen
2016-12-07 22:04 ` Junio C Hamano
2016-12-07 22:36 ` Brandon Williams
2016-12-06 21:51 ` [PATCH 17/17] pathspec: remove outdated comment Brandon Williams
2016-12-07 22:04 ` [PATCH 00/17] pathspec cleanup Junio C Hamano
2016-12-08 18:58 ` [PATCH v2 00/16] " Brandon Williams
2016-12-08 18:58 ` [PATCH v2 01/16] mv: remove use of deprecated 'get_pathspec()' Brandon Williams
2016-12-08 18:58 ` [PATCH v2 02/16] dir: convert create_simplify to use the pathspec struct interface Brandon Williams
2016-12-08 18:58 ` [PATCH v2 03/16] dir: convert fill_directory " Brandon Williams
2016-12-08 18:58 ` [PATCH v2 04/16] ls-tree: convert show_recursive " Brandon Williams
2016-12-08 18:58 ` [PATCH v2 05/16] pathspec: remove the deprecated get_pathspec function Brandon Williams
2016-12-08 18:59 ` [PATCH v2 06/16] pathspec: copy and free owned memory Brandon Williams
2016-12-08 18:59 ` [PATCH v2 07/16] pathspec: remove unused variable from unsupported_magic Brandon Williams
2016-12-08 18:59 ` [PATCH v2 08/16] pathspec: always show mnemonic and name in unsupported_magic Brandon Williams
2016-12-08 18:59 ` [PATCH v2 09/16] pathspec: simpler logic to prefix original pathspec elements Brandon Williams
2016-12-08 18:59 ` [PATCH v2 10/16] pathspec: factor global magic into its own function Brandon Williams
2016-12-08 18:59 ` [PATCH v2 11/16] pathspec: create parse_short_magic function Brandon Williams
2016-12-08 18:59 ` [PATCH v2 12/16] pathspec: create parse_long_magic function Brandon Williams
2016-12-09 23:44 ` Junio C Hamano
2016-12-09 23:52 ` Stefan Beller
2016-12-10 0:29 ` Brandon Williams
2016-12-10 18:18 ` Junio C Hamano
2016-12-12 5:38 ` Stefan Beller
2016-12-12 6:19 ` Junio C Hamano
2016-12-08 18:59 ` [PATCH v2 13/16] pathspec: create parse_element_magic helper Brandon Williams
2016-12-08 18:59 ` [PATCH v2 14/16] pathspec: create strip submodule slash helpers Brandon Williams
2016-12-09 0:28 ` Junio C Hamano
2016-12-09 12:16 ` Duy Nguyen
2016-12-09 19:18 ` [PATCH " Brandon Williams
2016-12-09 19:40 ` Stefan Beller
2016-12-09 20:30 ` Brandon Williams
2016-12-08 18:59 ` [PATCH v2 15/16] pathspec: small readability changes Brandon Williams
2016-12-08 18:59 ` [PATCH v2 16/16] pathspec: rename prefix_pathspec to init_pathspec_item Brandon Williams
2016-12-09 0:25 ` [PATCH v2 00/16] pathspec cleanup Junio C Hamano
2016-12-09 19:03 ` Brandon Williams
2016-12-13 23:14 ` [PATCH v3 " Brandon Williams
2016-12-13 23:14 ` [PATCH v3 01/16] mv: remove use of deprecated 'get_pathspec()' Brandon Williams
2016-12-13 23:14 ` [PATCH v3 02/16] dir: remove struct path_simplify Brandon Williams
2016-12-19 17:33 ` Stefan Beller
2017-01-03 12:02 ` Duy Nguyen
2016-12-13 23:14 ` [PATCH v3 03/16] dir: convert fill_directory to use the pathspec struct interface Brandon Williams
2016-12-13 23:14 ` [PATCH v3 04/16] ls-tree: convert show_recursive " Brandon Williams
2016-12-13 23:14 ` [PATCH v3 05/16] pathspec: remove the deprecated get_pathspec function Brandon Williams
2016-12-13 23:14 ` Brandon Williams [this message]
2017-01-03 12:06 ` [PATCH v3 06/16] pathspec: copy and free owned memory Duy Nguyen
2016-12-13 23:14 ` [PATCH v3 07/16] pathspec: remove unused variable from unsupported_magic Brandon Williams
2016-12-13 23:14 ` [PATCH v3 08/16] pathspec: always show mnemonic and name in unsupported_magic Brandon Williams
2017-01-03 12:14 ` Duy Nguyen
2017-01-03 18:15 ` Brandon Williams
2016-12-13 23:14 ` [PATCH v3 09/16] pathspec: simpler logic to prefix original pathspec elements Brandon Williams
2016-12-13 23:14 ` [PATCH v3 10/16] pathspec: factor global magic into its own function Brandon Williams
2016-12-13 23:14 ` [PATCH v3 11/16] pathspec: create parse_short_magic function Brandon Williams
2016-12-13 23:14 ` [PATCH v3 12/16] pathspec: create parse_long_magic function Brandon Williams
2016-12-13 23:14 ` [PATCH v3 13/16] pathspec: create parse_element_magic helper Brandon Williams
2016-12-13 23:14 ` [PATCH v3 14/16] pathspec: create strip submodule slash helpers Brandon Williams
2016-12-13 23:14 ` [PATCH v3 15/16] pathspec: small readability changes Brandon Williams
2016-12-13 23:14 ` [PATCH v3 16/16] pathspec: rename prefix_pathspec to init_pathspec_item Brandon Williams
2017-01-03 18:42 ` [PATCH v4 00/16] pathspec cleanup Brandon Williams
2017-01-03 18:42 ` [PATCH v4 01/16] mv: remove use of deprecated 'get_pathspec()' Brandon Williams
2017-01-03 18:42 ` [PATCH v4 02/16] dir: remove struct path_simplify Brandon Williams
2017-01-03 18:42 ` [PATCH v4 03/16] dir: convert fill_directory to use the pathspec struct interface Brandon Williams
2017-01-03 18:42 ` [PATCH v4 04/16] ls-tree: convert show_recursive " Brandon Williams
2017-01-03 18:42 ` [PATCH v4 05/16] pathspec: remove the deprecated get_pathspec function Brandon Williams
2017-01-03 18:42 ` [PATCH v4 06/16] pathspec: copy and free owned memory Brandon Williams
2017-01-03 18:42 ` [PATCH v4 07/16] pathspec: remove unused variable from unsupported_magic Brandon Williams
2017-01-03 18:42 ` [PATCH v4 08/16] pathspec: always show mnemonic and name in unsupported_magic Brandon Williams
2017-01-03 18:42 ` [PATCH v4 09/16] pathspec: simpler logic to prefix original pathspec elements Brandon Williams
2017-01-03 18:42 ` [PATCH v4 10/16] pathspec: factor global magic into its own function Brandon Williams
2017-01-03 18:42 ` [PATCH v4 11/16] pathspec: create parse_short_magic function Brandon Williams
2017-01-03 18:42 ` [PATCH v4 12/16] pathspec: create parse_long_magic function Brandon Williams
2017-01-03 18:42 ` [PATCH v4 13/16] pathspec: create parse_element_magic helper Brandon Williams
2017-01-03 18:42 ` [PATCH v4 14/16] pathspec: create strip submodule slash helpers Brandon Williams
2017-01-03 18:42 ` [PATCH v4 15/16] pathspec: small readability changes Brandon Williams
2017-01-03 18:42 ` [PATCH v4 16/16] pathspec: rename prefix_pathspec to init_pathspec_item Brandon Williams
2017-01-04 13:56 ` [PATCH v4 00/16] pathspec cleanup Duy Nguyen
2017-01-04 17:53 ` Brandon Williams
2017-01-04 17:56 ` Brandon Williams
2017-01-04 18:03 ` [PATCH v5 " Brandon Williams
2017-01-04 18:03 ` [PATCH v5 01/16] mv: remove use of deprecated 'get_pathspec()' Brandon Williams
2017-01-04 18:03 ` [PATCH v5 02/16] dir: remove struct path_simplify Brandon Williams
2017-01-04 18:03 ` [PATCH v5 03/16] dir: convert fill_directory to use the pathspec struct interface Brandon Williams
2017-01-04 18:03 ` [PATCH v5 04/16] ls-tree: convert show_recursive " Brandon Williams
2017-01-04 18:04 ` [PATCH v5 05/16] pathspec: remove the deprecated get_pathspec function Brandon Williams
2017-01-04 18:04 ` [PATCH v5 06/16] pathspec: copy and free owned memory Brandon Williams
2017-01-04 18:04 ` [PATCH v5 07/16] pathspec: remove unused variable from unsupported_magic Brandon Williams
2017-01-04 18:04 ` [PATCH v5 08/16] pathspec: always show mnemonic and name in unsupported_magic Brandon Williams
2017-01-04 18:04 ` [PATCH v5 09/16] pathspec: simpler logic to prefix original pathspec elements Brandon Williams
2017-01-04 18:04 ` [PATCH v5 10/16] pathspec: factor global magic into its own function Brandon Williams
2017-01-04 18:04 ` [PATCH v5 11/16] pathspec: create parse_short_magic function Brandon Williams
2017-01-04 18:04 ` [PATCH v5 12/16] pathspec: create parse_long_magic function Brandon Williams
2017-01-04 18:04 ` [PATCH v5 13/16] pathspec: create parse_element_magic helper Brandon Williams
2017-01-04 18:04 ` [PATCH v5 14/16] pathspec: create strip submodule slash helpers Brandon Williams
2017-01-04 18:04 ` [PATCH v5 15/16] pathspec: small readability changes Brandon Williams
2017-01-04 18:04 ` [PATCH v5 16/16] pathspec: rename prefix_pathspec to init_pathspec_item Brandon Williams
2017-01-07 9:29 ` [PATCH v5 00/16] pathspec cleanup Duy Nguyen
2017-01-09 2:04 ` Junio C Hamano
2017-01-09 17:57 ` Brandon Williams
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=1481670870-66754-7-git-send-email-bmwill@google.com \
--to=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.com \
--cc=sbeller@google.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).