summaryrefslogtreecommitdiff
path: root/http.c
diff options
context:
space:
mode:
authorTay Ray Chuan <rctay89@gmail.com>2009-08-26 12:20:53 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-08-29 02:24:43 (GMT)
commit4b9fa0e359a710b5d8dae542a92df7dbe56d9915 (patch)
tree0695f547a37b13d36fe6bdbd81f12b12cebaf2cd /http.c
parent749086fa090d81c10ebf16b1abfd138c3fa0232e (diff)
downloadgit-4b9fa0e359a710b5d8dae542a92df7dbe56d9915.zip
git-4b9fa0e359a710b5d8dae542a92df7dbe56d9915.tar.gz
git-4b9fa0e359a710b5d8dae542a92df7dbe56d9915.tar.bz2
http.c: set slot callback members to NULL when releasing object
Set the members callback_func and callback_data of freq->slot to NULL when releasing a http_object_request. release_active_slot() is also invoked on the slot to remove the curl handle associated with the slot from the multi stack (CURLM *curlm in http.c). These prevent the callback function and data from being used in http methods (like http.c::finish_active_slot()) after a http_object_request has been free'd. Noticed by Ali Polatel, who later tested this patch to verify that it fixes the problem he saw; Dscho helped to identify the problem spot. Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'http.c')
-rw-r--r--http.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/http.c b/http.c
index a2720d5..1ae19e0 100644
--- a/http.c
+++ b/http.c
@@ -1285,5 +1285,10 @@ void release_http_object_request(struct http_object_request *freq)
free(freq->url);
freq->url = NULL;
}
- freq->slot = NULL;
+ if (freq->slot != NULL) {
+ freq->slot->callback_func = NULL;
+ freq->slot->callback_data = NULL;
+ release_active_slot(freq->slot);
+ freq->slot = NULL;
+ }
}