From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 16 Jul 2014 18:33:11 +0000 (-0700)
Subject: Merge branch 'ah/fix-http-push'
X-Git-Tag: v2.1.0-rc0~30
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d9037eae7e67680016b92e2113e4ab4878660345?hp=1fc83452c76e65385b3da69ea94eb957e36e6c78

Merge branch 'ah/fix-http-push'

An ancient rewrite passed a wrong pointer to a curl library
function in a rarely used code path.

* ah/fix-http-push:
http-push.c: make CURLOPT_IOCTLDATA a usable pointer
---

diff --git a/http-push.c b/http-push.c
index 6c3cc1725a..952f8ede49 100644
--- a/http-push.c
+++ b/http-push.c
@@ -199,7 +199,7 @@ static void curl_setup_http(CURL *curl, const char *url,
 	curl_easy_setopt(curl, CURLOPT_READFUNCTION, fread_buffer);
 #ifndef NO_CURL_IOCTL
 	curl_easy_setopt(curl, CURLOPT_IOCTLFUNCTION, ioctl_buffer);
-	curl_easy_setopt(curl, CURLOPT_IOCTLDATA, &buffer);
+	curl_easy_setopt(curl, CURLOPT_IOCTLDATA, buffer);
 #endif
 	curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_fn);
 	curl_easy_setopt(curl, CURLOPT_NOBODY, 0);