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

[karl at motherfish-iii.xiph.org]

Author: karl
Date: 2005-06-15 18:58:53 -0700 (Wed, 15 Jun 2005)
New Revision: 9458

Modified:
   icecast/branches/kh/icecast/src/format.c
   icecast/branches/kh/icecast/src/fserve.c
Log:
plug fd leak on error case. start at correct offset from burst point when
searching for sync point.


Modified: icecast/branches/kh/icecast/src/format.c
===================================================================
--- icecast/branches/kh/icecast/src/format.c	2005-06-15 20:29:57 UTC (rev 9457)
+++ icecast/branches/kh/icecast/src/format.c	2005-06-16 01:58:53 UTC (rev 9458)
@@ -110,7 +110,7 @@
     {
         long size = 0;
         refbuf = source->burst_point;
-        size = source->burst_size - client->intro_offset;
+        size = client->intro_offset;
         while (size > 0 && refbuf->next)
         {
             size -= refbuf->len;

Modified: icecast/branches/kh/icecast/src/fserve.c
===================================================================
--- icecast/branches/kh/icecast/src/fserve.c	2005-06-15 20:29:57 UTC (rev 9457)
+++ icecast/branches/kh/icecast/src/fserve.c	2005-06-16 01:58:53 UTC (rev 9458)
@@ -540,6 +540,7 @@
     httpclient->respcode = 416;
     sock_write (httpclient->con->sock,
             "HTTP/1.0 416 Request Range Not Satisfiable\r\n\r\n");
+    client_destroy (httpclient);
     return 0;
 }