mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix XML parser leaks in http-push

Browse Source 
XML_Parser were never freed. While at it, move the parser initialization to
right before it is needed.

Signed-off-by: Mike Hommey <mh@glandium.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Mike Hommey
2007-12-11 23:50:21 +01:00
committed by Junio C Hamano
parent 03b69c7606
commit 472b257099
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
http-push.c
View File

@ -1275,8 +1275,6 @@ static struct remote_lock *lock_remote(const char *path, long timeout)
char *ep; char *ep;
char timeout_header[25]; char timeout_header[25];
struct remote_lock *lock = NULL; struct remote_lock *lock = NULL;
XML_Parser parser = XML_ParserCreate(NULL);
enum XML_Status result;
struct curl_slist *dav_headers = NULL; struct curl_slist *dav_headers = NULL;
struct xml_ctx ctx; struct xml_ctx ctx;
@ -1345,6 +1343,8 @@ static struct remote_lock *lock_remote(const char *path, long timeout)
if (start_active_slot(slot)) { if (start_active_slot(slot)) {
run_active_slot(slot); run_active_slot(slot);
if (results.curl_result == CURLE_OK) { if (results.curl_result == CURLE_OK) {
XML_Parser parser = XML_ParserCreate(NULL);
enum XML_Status result;
ctx.name = xcalloc(10, 1); ctx.name = xcalloc(10, 1);
ctx.len = 0; ctx.len = 0;
ctx.cdata = NULL; ctx.cdata = NULL;
@ -1363,6 +1363,7 @@ static struct remote_lock *lock_remote(const char *path, long timeout)
XML_GetErrorCode(parser))); XML_GetErrorCode(parser)));
lock->timeout = -1; lock->timeout = -1;
} }
XML_ParserFree(parser);
} }
} else { } else {
fprintf(stderr, "Unable to start LOCK request\n"); fprintf(stderr, "Unable to start LOCK request\n");
@ -1525,8 +1526,6 @@ static void remote_ls(const char *path, int flags,
struct buffer out_buffer; struct buffer out_buffer;
char *in_data; char *in_data;
char *out_data; char *out_data;
XML_Parser parser = XML_ParserCreate(NULL);
enum XML_Status result;
struct curl_slist *dav_headers = NULL; struct curl_slist *dav_headers = NULL;
struct xml_ctx ctx; struct xml_ctx ctx;
struct remote_ls_ctx ls; struct remote_ls_ctx ls;
@ -1569,6 +1568,8 @@ static void remote_ls(const char *path, int flags,
if (start_active_slot(slot)) { if (start_active_slot(slot)) {
run_active_slot(slot); run_active_slot(slot);
if (results.curl_result == CURLE_OK) { if (results.curl_result == CURLE_OK) {
XML_Parser parser = XML_ParserCreate(NULL);
enum XML_Status result;
ctx.name = xcalloc(10, 1); ctx.name = xcalloc(10, 1);
ctx.len = 0; ctx.len = 0;
ctx.cdata = NULL; ctx.cdata = NULL;
@ -1587,6 +1588,7 @@ static void remote_ls(const char *path, int flags,
XML_ErrorString( XML_ErrorString(
XML_GetErrorCode(parser))); XML_GetErrorCode(parser)));
} }
XML_ParserFree(parser);
} }
} else { } else {
fprintf(stderr, "Unable to start PROPFIND request\n"); fprintf(stderr, "Unable to start PROPFIND request\n");
@ -1620,8 +1622,6 @@ static int locking_available(void)
struct buffer out_buffer; struct buffer out_buffer;
char *in_data; char *in_data;
char *out_data; char *out_data;
XML_Parser parser = XML_ParserCreate(NULL);
enum XML_Status result;
struct curl_slist *dav_headers = NULL; struct curl_slist *dav_headers = NULL;
struct xml_ctx ctx; struct xml_ctx ctx;
int lock_flags = 0; int lock_flags = 0;
@ -1658,6 +1658,8 @@ static int locking_available(void)
if (start_active_slot(slot)) { if (start_active_slot(slot)) {
run_active_slot(slot); run_active_slot(slot);
if (results.curl_result == CURLE_OK) { if (results.curl_result == CURLE_OK) {
XML_Parser parser = XML_ParserCreate(NULL);
enum XML_Status result;
ctx.name = xcalloc(10, 1); ctx.name = xcalloc(10, 1);
ctx.len = 0; ctx.len = 0;
ctx.cdata = NULL; ctx.cdata = NULL;
@ -1676,6 +1678,7 @@ static int locking_available(void)
XML_GetErrorCode(parser))); XML_GetErrorCode(parser)));
lock_flags = 0; lock_flags = 0;
} }
XML_ParserFree(parser);
} }
} else { } else {
fprintf(stderr, "Unable to start PROPFIND request\n"); fprintf(stderr, "Unable to start PROPFIND request\n");