Merge branch 'maint'

gitster · gitster · commit 42fa6df99fe1 · 2009-08-28T19:37:57.000-07:00
* maint:
  http.c: set slot callback members to NULL when releasing object
diff --git 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;
+	}
 }

Original file line number	Diff line number	Diff line change
`@@ -1289,5 +1289,10 @@ void release_http_object_request(struct http_object_request *freq)`
`1289`	`1289`	`free(freq->url);`
`1290`	`1290`	`freq->url = NULL;`
`1291`	`1291`	`}`
`1292`		`- freq->slot = NULL;`
	`1292`	`+ if (freq->slot != NULL) {`
	`1293`	`+ freq->slot->callback_func = NULL;`
	`1294`	`+ freq->slot->callback_data = NULL;`
	`1295`	`+ release_active_slot(freq->slot);`
	`1296`	`+ freq->slot = NULL;`
	`1297`	`+ }`
`1293`	`1298`	`}`