summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-08-28 19:37:57 -0700
committerJunio C Hamano <gitster@pobox.com>2009-08-28 19:37:57 -0700
commit42fa6df99fe1f0439244893e81efad0cc4524c3d (patch)
tree5e3d48ed14a8ccfe5b95669eaf8c73d980b6c70d
parent8648732e298b74b25171c97e6ea144818f29c403 (diff)
parent48ae73b11487e12f8f7198e18779e65500d4ca0c (diff)
downloadgit-42fa6df99fe1f0439244893e81efad0cc4524c3d.tar.gz
Merge branch 'maint'
* maint: http.c: set slot callback members to NULL when releasing object
-rw-r--r--http.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/http.c b/http.c
index eb0c669801..5926c5b3f7 100644
--- a/http.c
+++ b/http.c
@@ -1289,5 +1289,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;
+ }
}