[xiph-commits] r9130 - icecast/branches/kh/icecast/src

[karl at motherfish-iii.xiph.org]

Author: karl
Date: 2005-04-11 08:13:35 -0700 (Mon, 11 Apr 2005)
New Revision: 9130

Modified:
   icecast/branches/kh/icecast/src/admin.c
   icecast/branches/kh/icecast/src/slave.c
Log:
fixes to NULL pointer issues


Modified: icecast/branches/kh/icecast/src/admin.c
===================================================================
--- icecast/branches/kh/icecast/src/admin.c	2005-04-08 13:35:05 UTC (rev 9129)
+++ icecast/branches/kh/icecast/src/admin.c	2005-04-11 15:13:35 UTC (rev 9130)
@@ -238,7 +238,7 @@
         }
 
         thread_mutex_lock (&source->lock);
-        if (source->running || source->on_demand)
+        if (source->file_only == 0 && (source->running || source->on_demand))
         {
             ice_config_t *config;
             mount_proxy *mountinfo;
@@ -254,7 +254,7 @@
 
             config = config_get_config();
             mountinfo = config_find_mount (config, source->mount);
-            if (mountinfo->auth)
+            if (mountinfo && mountinfo->auth)
             {
                 xmlNewChild(srcnode, NULL, "authenticator", 
                         mountinfo->auth->type);

Modified: icecast/branches/kh/icecast/src/slave.c
===================================================================
--- icecast/branches/kh/icecast/src/slave.c	2005-04-08 13:35:05 UTC (rev 9129)
+++ icecast/branches/kh/icecast/src/slave.c	2005-04-11 15:13:35 UTC (rev 9130)
@@ -685,11 +685,13 @@
     config_release_config();
     source_recheck_mounts();
 
-    while (slave_running)
+    while (1)
     {
         relay_server *cleanup_relays;
 
         thread_sleep (1000000);
+        if (slave_running == 0)
+            break;
         if (rescan_relays == 0 && max_interval > ++interval)
             continue;