commit 90dce51584e908232ff279a6c2949ea9855dddf3
author Jim Meyering <jim@meyering.net> Sun Jun 14 21:47:54 2009 +0200
committer Junio C Hamano <gitster@pobox.com> Sun Jun 14 13:37:14 2009 -0700
tree 9d1cdacffd4be1c27f1a1ac84c28886d3cb57696
parent c97038d1cfbd98ea258086c417fe4f0c094596d3

use xstrdup, not strdup in ll-merge.c

Otherwise, a fluky allocation failure would cause merge
configuration settings to be silently ignored.

Signed-off-by: Jim Meyering <meyering@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

ll-merge.c

diff --git a/ll-merge.c b/ll-merge.c
index 9837c84..e339b8c 100644
--- a/ll-merge.c
+++ b/ll-merge.c
@@ -233,7 +233,7 @@
 
 	if (!strcmp(var, "merge.default")) {
 		if (value)
-			default_ll_merge = strdup(value);
+			default_ll_merge = xstrdup(value);
 		return 0;
 	}
 
@@ -267,7 +267,7 @@
 	if (!strcmp("name", ep)) {
 		if (!value)
 			return error("%s: lacks value", var);
-		fn->description = strdup(value);
+		fn->description = xstrdup(value);
 		return 0;
 	}
 
@@ -290,14 +290,14 @@
 		 * file named by %A, and signal that it has done with zero exit
 		 * status.
 		 */
-		fn->cmdline = strdup(value);
+		fn->cmdline = xstrdup(value);
 		return 0;
 	}
 
 	if (!strcmp("recursive", ep)) {
 		if (!value)
 			return error("%s: lacks value", var);
-		fn->recursive = strdup(value);
+		fn->recursive = xstrdup(value);
 		return 0;
 	}