From a26bb50004111839bb3a778ac12bd038ac321179 Mon Sep 17 00:00:00 2001
From: Karl Heyes <karl@xiph.org>
Date: Sat, 20 Oct 2007 01:58:14 +0000
Subject: [PATCH] fix some potential minor memory leaks

svn path=/icecast/trunk/icecast/; revision=14018
---
 src/auth_url.c | 2 +-
 src/cfgfile.c  | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/auth_url.c b/src/auth_url.c
index d423cf96..387dca11 100644
--- a/src/auth_url.c
+++ b/src/auth_url.c
@@ -509,7 +509,7 @@ int auth_get_url_auth (auth_t *authenticator, config_options_t *options)
     url_info->handle = curl_easy_init ();
     if (url_info->handle == NULL)
     {
-        free (url_info);
+        auth_url_clear (authenticator);
         return -1;
     }
     if (url_info->auth_header)
diff --git a/src/cfgfile.c b/src/cfgfile.c
index 5b41e4ff..9737ccc9 100644
--- a/src/cfgfile.c
+++ b/src/cfgfile.c
@@ -723,6 +723,7 @@ static void _parse_relay(xmlDocPtr doc, xmlNodePtr node,
         if (xmlIsBlankNode(node)) continue;
 
         if (xmlStrcmp (node->name, XMLSTR("server")) == 0) {
+            if (relay->server) xmlFree (relay->server);
             relay->server = (char *)xmlNodeListGetString(
                     doc, node->xmlChildrenNode, 1);
         }
@@ -732,10 +733,12 @@ static void _parse_relay(xmlDocPtr doc, xmlNodePtr node,
             if(tmp) xmlFree(tmp);
         }
         else if (xmlStrcmp (node->name, XMLSTR("mount")) == 0) {
+            if (relay->mount) xmlFree (relay->mount);
             relay->mount = (char *)xmlNodeListGetString(
                     doc, node->xmlChildrenNode, 1);
         }
         else if (xmlStrcmp (node->name, XMLSTR("local-mount")) == 0) {
+            if (relay->localmount) xmlFree (relay->localmount);
             relay->localmount = (char *)xmlNodeListGetString(
                     doc, node->xmlChildrenNode, 1);
         }
@@ -745,10 +748,12 @@ static void _parse_relay(xmlDocPtr doc, xmlNodePtr node,
             if(tmp) xmlFree(tmp);
         }
         else if (xmlStrcmp (node->name, XMLSTR("username")) == 0) {
+            if (relay->username) xmlFree (relay->username);
             relay->username = (char *)xmlNodeListGetString(doc,
                     node->xmlChildrenNode, 1);
         }
         else if (xmlStrcmp (node->name, XMLSTR("password")) == 0) {
+            if (relay->password) xmlFree (relay->password);
             relay->password = (char *)xmlNodeListGetString(doc,
                     node->xmlChildrenNode, 1);
         }