summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Hengeveld <nickh@reactrix.com>2005-11-18 19:03:25 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-20 04:17:25 (GMT)
commit7b8999674955b9d6b58de2b8f71b2e2ede795f65 (patch)
tree6cadc88f585abc5ce65e723946b45955b486b27e
parentacf59575cac330f3a505247dd7a9d6551a2a9cf8 (diff)
downloadgit-7b8999674955b9d6b58de2b8f71b2e2ede795f65.zip
git-7b8999674955b9d6b58de2b8f71b2e2ede795f65.tar.gz
git-7b8999674955b9d6b58de2b8f71b2e2ede795f65.tar.bz2
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>
-rw-r--r--http-push.c17
1 files changed, 14 insertions, 3 deletions
diff --git a/http-push.c b/http-push.c
index 2932693..f3c92c9 100644
--- a/http-push.c
+++ b/http-push.c
@@ -165,6 +165,7 @@ static void start_check(struct transfer_request *request)
} else {
request->state = ABORTED;
free(request->url);
+ request->url = NULL;
}
}
@@ -198,6 +199,7 @@ static void start_mkcol(struct transfer_request *request)
} else {
request->state = ABORTED;
free(request->url);
+ request->url = NULL;
}
}
@@ -244,8 +246,6 @@ static void start_put(struct transfer_request *request)
request->buffer.size = stream.total_out;
request->buffer.posn = 0;
- if (request->url != NULL)
- free(request->url);
request->url = xmalloc(strlen(remote->url) +
strlen(request->lock->token) + 51);
strcpy(request->url, remote->url);
@@ -281,6 +281,7 @@ static void start_put(struct transfer_request *request)
} else {
request->state = ABORTED;
free(request->url);
+ request->url = NULL;
}
}
@@ -306,6 +307,7 @@ static void start_move(struct transfer_request *request)
} else {
request->state = ABORTED;
free(request->url);
+ request->url = NULL;
}
}
@@ -370,6 +372,13 @@ static void finish_request(struct transfer_request *request)
if (request->headers != NULL)
curl_slist_free_all(request->headers);
+
+ /* URL is reused for MOVE after PUT */
+ if (request->state != RUN_PUT) {
+ free(request->url);
+ request->url = NULL;
+ }
+
if (request->state == RUN_HEAD) {
if (request->http_code == 404) {
request->state = NEED_PUSH;
@@ -435,7 +444,8 @@ static void release_request(struct transfer_request *request)
entry->next = entry->next->next;
}
- free(request->url);
+ if (request->url != NULL)
+ free(request->url);
free(request);
}
@@ -575,6 +585,7 @@ static int fetch_index(unsigned char *sha1)
}
} else {
free(url);
+ fclose(indexfile);
return error("Unable to start request");
}