Fix bunch of fd leaks in http-fetch
The current http-fetch is rather careless about fd leakage, causing problems while fetching large repositories. This patch does not reserve exhaustiveness, but I covered everything I spotted. I also left some safeguards in place in case I missed something, so that we get to know, sooner or later. Reported by Becky Bruce <becky.bruce@freescale.com>. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
Petr Baudis committed
Nov 12, 2005 at 00:55 UTC
313c4714c5ec1673805b952ba79d910a42e8937c
1 file changed
+14
-2
http-fetch.c
+14
-2
@@ -425,6 +425,8 @@ static void start_request(struct transfer_request *request)
425
rename(request->tmpfile, prevfile);
426
unlink(request->tmpfile);
427
428
+ if (request->local != -1)
429
+ error("fd leakage in start: %d", request->local);
430
request->local = open(request->tmpfile,
431
O_WRONLY | O_CREAT | O_EXCL, 0666);
432
/* This could have failed due to the "lazy directory creation";
@@ -523,7 +525,7 @@ static void start_request(struct transfer_request *request)
525
/* Try to get the request started, abort the request on error */
526
if (!start_active_slot(slot)) {
527
request->state = ABORTED;
526
- close(request->local);
528
+ close(request->local); request->local = -1;
529
free(request->url);
530
return;
531
}
@@ -537,7 +539,7 @@ static void finish_request(struct transfer_request *request)
539
struct stat st;
540
541
fchmod(request->local, 0444);
540
- close(request->local);
542
+ close(request->local); request->local = -1;
543
544
if (request->http_code == 416) {
545
fprintf(stderr, "Warning: requested range invalid; we may already have all the data.\n");
@@ -569,6 +571,8 @@ static void release_request(struct transfer_request *request)
571
{
572
struct transfer_request *entry = request_queue_head;
573
574
+ if (request->local != -1)
575
+ error("fd leakage in release: %d", request->local);
576
if (request == request_queue_head) {
577
request_queue_head = request->next;
578
} else {
@@ -631,6 +635,8 @@ static void process_curl_messages(void)
635
if (request->repo->next != NULL) {
636
request->repo =
637
request->repo->next;
638
+ close(request->local);
639
+ request->local = -1;
640
start_request(request);
641
} else {
642
finish_request(request);
@@ -763,6 +769,7 @@ static int fetch_index(struct alt_base *repo, unsigned char *sha1)
769
curl_errorstr);
770
}
771
} else {
772
+ fclose(indexfile);
773
return error("Unable to start request");
774
}
775
@@ -1083,6 +1090,7 @@ static int fetch_pack(struct alt_base *repo, unsigned char *sha1)
1090
curl_errorstr);
1091
}
1092
} else {
1093
+ fclose(packfile);
1094
return error("Unable to start request");
1095
}
1096
@@ -1145,6 +1153,7 @@ static int fetch_object(struct alt_base *repo, unsigned char *sha1)
1153
fetch_alternates(alt->base);
1154
if (request->repo->next != NULL) {
1155
request->repo = request->repo->next;
1156
+ close(request->local); request->local = -1;
1157
start_request(request);
1158
}
1159
} else {
@@ -1153,6 +1162,9 @@ static int fetch_object(struct alt_base *repo, unsigned char *sha1)
1162
}
1163
#endif
1164
}
1165
+ if (request->local != -1) {
1166
+ close(request->local); request->local = -1;
1167
+ }
1168
1169
if (request->state == ABORTED) {
1170
release_request(request);