@matheusbsbs / matheus-bagliano / commits / 7b89996749
Fork 0

http-push memory/fd cleanup

Clean up memory and file descriptor usage Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net>

Nick Hengeveld committed Nov 18, 2005 at 11:03 UTC 7b8999674955b9d6b58de2b8f71b2e2ede795f65
1 file changed +14 -3
http-push.c
+14 -3
@@ -165,6 +165,7 @@ static void start_check(struct transfer_request *request)
165 } else {
166 request->state = ABORTED;
167 free(request->url);
168 + request->url = NULL;
169 }
170 }
171
@@ -198,6 +199,7 @@ static void start_mkcol(struct transfer_request *request)
199 } else {
200 request->state = ABORTED;
201 free(request->url);
202 + request->url = NULL;
203 }
204 }
205
@@ -244,8 +246,6 @@ static void start_put(struct transfer_request *request)
246 request->buffer.size = stream.total_out;
247 request->buffer.posn = 0;
248
247 - if (request->url != NULL)
248 - free(request->url);
249 request->url = xmalloc(strlen(remote->url) +
250 strlen(request->lock->token) + 51);
251 strcpy(request->url, remote->url);
@@ -281,6 +281,7 @@ static void start_put(struct transfer_request *request)
281 } else {
282 request->state = ABORTED;
283 free(request->url);
284 + request->url = NULL;
285 }
286 }
287
@@ -306,6 +307,7 @@ static void start_move(struct transfer_request *request)
307 } else {
308 request->state = ABORTED;
309 free(request->url);
310 + request->url = NULL;
311 }
312 }
313
@@ -370,6 +372,13 @@ static void finish_request(struct transfer_request *request)
372
373 if (request->headers != NULL)
374 curl_slist_free_all(request->headers);
375 +
376 + /* URL is reused for MOVE after PUT */
377 + if (request->state != RUN_PUT) {
378 + free(request->url);
379 + request->url = NULL;
380 + }
381 +
382 if (request->state == RUN_HEAD) {
383 if (request->http_code == 404) {
384 request->state = NEED_PUSH;
@@ -435,7 +444,8 @@ static void release_request(struct transfer_request *request)
444 entry->next = entry->next->next;
445 }
446
438 - free(request->url);
447 + if (request->url != NULL)
448 + free(request->url);
449 free(request);
450 }
451
@@ -575,6 +585,7 @@ static int fetch_index(unsigned char *sha1)
585 }
586 } else {
587 free(url);
588 + fclose(indexfile);
589 return error("Unable to start request");
590 }
591