diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-07-16 11:33:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-16 11:33:11 -0700 |
| commit | d9037eae7e67680016b92e2113e4ab4878660345 (patch) | |
| tree | 63856b7ca490b2618af80d350ca6ad4737f9b104 /http-push.c | |
| parent | 1fc83452c76e65385b3da69ea94eb957e36e6c78 (diff) | |
| parent | 479eaa8ef8384d8026dc05c1288e96ffd9e296d6 (diff) | |
| download | git-d9037eae7e67680016b92e2113e4ab4878660345.tar.gz | |
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
Diffstat (limited to 'http-push.c')
| -rw-r--r-- | http-push.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |