Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'ah/fix-http-push'
author
Junio C Hamano
<gitster@pobox.com>
Wed, 16 Jul 2014 18:33:11 +0000
(11:33 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 16 Jul 2014 18:33:11 +0000
(11:33 -0700)
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
http-push.c
patch
|
blob
|
history
raw
(from parent 1:
1fc8345
)
diff --git
a/http-push.c
b/http-push.c
index 6c3cc1725a9461876c7db11b9818eb553afb2fc2..952f8ede49daf4e275c42cc0682bb01c4c58446a 100644
(file)
--- 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);