git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "René Scharfe" <l.s.r@web.de>
To: Jeff King <peff@peff.net>
Cc: Git List <git@vger.kernel.org>, Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v2 1/4] commit: use xstrdup() in get_merge_parent()
Date: Sat, 13 Aug 2016 14:09:49 +0200	[thread overview]
Message-ID: <57AF0E0D.9030205@web.de> (raw)
In-Reply-To: <57AF0D8E.6040309@web.de>

Handle allocation errors for the name member just like we already do
for the struct merge_remote_desc itself.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
---
 commit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/commit.c b/commit.c
index 71a360d..ccd232a 100644
--- a/commit.c
+++ b/commit.c
@@ -1589,7 +1589,7 @@ struct commit *get_merge_parent(const char *name)
 		struct merge_remote_desc *desc;
 		desc = xmalloc(sizeof(*desc));
 		desc->obj = obj;
-		desc->name = strdup(name);
+		desc->name = xstrdup(name);
 		commit->util = desc;
 	}
 	return commit;
-- 
2.9.3


  reply	other threads:[~2016-08-13 12:10 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-13  9:14 [PATCH] commit: introduce set_merge_remote_desc() René Scharfe
2016-08-13  9:23 ` Jeff King
2016-08-13 12:07   ` René Scharfe
2016-08-13 12:09     ` René Scharfe [this message]
2016-08-13 12:11     ` [PATCH v2 2/4] commit: factor out set_merge_remote_desc() René Scharfe
2016-08-13 12:16     ` [PATCH v2 3/4] merge-recursive: fix verbose output for multiple base trees René Scharfe
2016-08-13 12:21     ` [PATCH v2 4/4] commit: use FLEX_ARRAY in struct merge_remote_desc René Scharfe
2016-08-13 12:24     ` [PATCH] commit: introduce set_merge_remote_desc() Jeff King

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=57AF0E0D.9030205@web.de \
    --to=l.s.r@web.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=peff@peff.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).