From c2f17bda074b2e5718456aed75fedd2196c8dc94 Mon Sep 17 00:00:00 2001
From: Michael Procter <michael@procter.org.uk>
Date: Thu, 23 Jul 2015 13:17:08 +0100
Subject: [PATCH] Ensure static oom error message not detached

Error messages that are detached are assumed to be dynamically
allocated.  Passing a pointer to the static oom error message
can cause an attempt to free the static buffer later.  This change
checks if the oom error message is about to be detached and detaches
a copy instead.
---
 src/errors.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/errors.c b/src/errors.c
index 7a2600586..979602a2a 100644
--- a/src/errors.c
+++ b/src/errors.c
@@ -125,10 +125,14 @@ int giterr_detach(git_error *cpy)
 	if (!error)
 		return -1;
 
-	cpy->message = error->message;
+	if (error == &g_git_oom_error) {
+		cpy->message = git__strdup(error->message);
+	} else {
+		cpy->message = error->message;
+		error->message = NULL;
+	}
 	cpy->klass = error->klass;
 
-	error->message = NULL;
 	giterr_clear();
 
 	return 0;