From 2b817daea2ee0680af640e440dd059ab1ff74638 Mon Sep 17 00:00:00 2001
From: Karl Heyes <karl@xiph.org>
Date: Fri, 10 Aug 2007 13:04:40 +0000
Subject: [PATCH] fix possible segv case, and only increase certain listener
 stats when stream is active (on demand relays may not actually start when
 triggered)

svn path=/icecast/trunk/icecast/; revision=13503
---
 src/auth.c   |  1 -
 src/format.c | 11 ++++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/auth.c b/src/auth.c
index de0a9a84..7f0a45a6 100644
--- a/src/auth.c
+++ b/src/auth.c
@@ -311,7 +311,6 @@ static int add_client_to_source (source_t *source, client_t *client)
     avl_tree_wlock (source->pending_tree);
     avl_insert (source->pending_tree, client);
     avl_tree_unlock (source->pending_tree);
-    stats_event_inc (NULL, "listener_connections");
 
     if (source->running == 0 && source->on_demand)
     {
diff --git a/src/format.c b/src/format.c
index 98603f7c..cda6a460 100644
--- a/src/format.c
+++ b/src/format.c
@@ -93,7 +93,7 @@ static void find_client_start (source_t *source, client_t *client)
 {
     refbuf_t *refbuf = source->burst_point;
 
-    /* we only want to attempt a burst at connection time, not midstream 
+    /* we only want to attempt a burst at connection time, not midstream
      * however streams like theora may not have the most recent page marked as
      * a starting point, so look for one from the burst point */
     if (client->intro_offset == -1 && source->stream_data_tail
@@ -101,10 +101,9 @@ static void find_client_start (source_t *source, client_t *client)
         refbuf = source->stream_data_tail;
     else
     {
-        long size = 0;
+        size_t size = client->intro_offset;
         refbuf = source->burst_point;
-        size = client->intro_offset;
-        while (size > 0 && refbuf->next)
+        while (size > 0 && refbuf && refbuf->next)
         {
             size -= refbuf->len;
             refbuf = refbuf->next;
@@ -129,7 +128,7 @@ static void find_client_start (source_t *source, client_t *client)
 static int get_file_data (FILE *intro, client_t *client)
 {
     refbuf_t *refbuf = client->refbuf;
-    int bytes;
+    size_t bytes;
 
     if (intro == NULL || fseek (intro, client->intro_offset, SEEK_SET) < 0)
         return 0;
@@ -209,6 +208,8 @@ int format_check_http_buffer (source_t *source, client_t *client)
             client->con->error = 1;
             return -1;
         }
+        stats_event_inc (NULL, "listener_connections");
+        stats_event_inc (source->mount, "listener_connections");
     }
 
     if (client->pos == refbuf->len)