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

[Karl Heyes]

karl        04/02/19 09:48:32

  Modified:    src      cfgfile.c source.c
  Log:
  small YP memory cleanup

Revision  Changes    Path
1.10      +9 -1      icecast/src/cfgfile.c

Index: cfgfile.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/cfgfile.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cfgfile.c	17 Feb 2004 15:46:05 -0000	1.9
+++ cfgfile.c	19 Feb 2004 14:48:31 -0000	1.10
@@ -147,7 +147,7 @@
         xmlFree(c->webroot_dir);
     if (c->adminroot_dir && c->adminroot_dir != CONFIG_DEFAULT_ADMINROOT_DIR)
         xmlFree(c->adminroot_dir);
-    if (c->pidfile) 
+    if (c->pidfile)
         xmlFree(c->pidfile);
     if (c->access_log && c->access_log != CONFIG_DEFAULT_ACCESS_LOG) 
         xmlFree(c->access_log);
@@ -215,6 +215,14 @@
         free(dirnode);
         dirnode = nextdirnode;
     }
+#ifdef HAVE_YP
+    i = 0;
+    while (i < c->num_yp_directories) 
+    {
+        xmlFree (c->yp_url[i]);
+        i++;
+    }
+#endif
 
     memset(c, 0, sizeof(ice_config_t));
 }

<p><p>1.71      +3 -1      icecast/src/source.c

Index: source.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/source.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- source.c	17 Feb 2004 15:46:05 -0000	1.70
+++ source.c	19 Feb 2004 14:48:31 -0000	1.71
@@ -219,8 +219,10 @@
     avl_tree_free(source->client_tree, _free_client);
     source->format->free_plugin(source->format);
 #ifdef USE_YP
-    for (i=0; i<source->num_yp_directories; i++) {
+    for (i=0; i<source->num_yp_directories; i++)
+    {
         yp_destroy_ypdata(source->ypdata[i]);
+        source->ypdata[i] = NULL;
     }
 #endif
     util_dict_free(source->audio_info);

<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.