[xiph-cvs] cvs commit: icecast/src config.c

[Michael Smith]

msmith      03/02/07 07:26:07

  Modified:    src      config.c
  Log:
  Free new config variables on shutdown (forgot to add this before)

Revision  Changes    Path
1.24      +13 -0     icecast/src/config.c

Index: config.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/config.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- config.c	7 Feb 2003 10:53:38 -0000	1.23
+++ config.c	7 Feb 2003 12:26:07 -0000	1.24
@@ -69,6 +69,7 @@
 {
         ice_config_dir_t *dirnode, *nextdirnode;
     ice_config_t *c = &_configuration;
+    relay_server *relay, *nextrelay;
 
         if (_config_filename) free(_config_filename);
 
@@ -80,6 +81,10 @@
         xmlFree(c->source_password);
         if (c->relay_password && c->relay_password != CONFIG_DEFAULT_SOURCE_PASSWORD)
         xmlFree(c->relay_password);
+	if (c->admin_username)
+        xmlFree(c->admin_username);
+	if (c->admin_password)
+        xmlFree(c->admin_password);
         if (c->hostname && c->hostname != CONFIG_DEFAULT_HOSTNAME) 
         xmlFree(c->hostname);
         if (c->base_dir && c->base_dir != CONFIG_DEFAULT_BASE_DIR) 
@@ -97,6 +102,14 @@
     if (c->master_password) xmlFree(c->master_password);
     if (c->user) xmlFree(c->user);
     if (c->group) xmlFree(c->group);
+    relay = _configuration.relay;
+    while(relay) {
+        nextrelay = relay->next;
+        xmlFree(relay->server);
+        xmlFree(relay->mount);
+        free(relay);
+        relay = nextrelay;
+    }
     dirnode = _configuration.dir_list;
     while(dirnode) {
         nextdirnode = dirnode->next;

<p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.