[GNUnet-SVN] r22997 - Extractor/src/main

[gnunet]

Author: grothoff
Date: 2012-07-31 00:05:58 +0200 (Tue, 31 Jul 2012)
New Revision: 22997

Modified:
   Extractor/src/main/extractor.c
   Extractor/src/main/extractor_datasource.c
Log:
-fixes

Modified: Extractor/src/main/extractor.c
===================================================================
--- Extractor/src/main/extractor.c      2012-07-30 21:59:59 UTC (rev 22996)
+++ Extractor/src/main/extractor.c      2012-07-30 22:05:58 UTC (rev 22997)
@@ -313,7 +313,7 @@
         if not, send 'seek' notification to plugins in range */
       for (pos = plugins; NULL != pos; pos = pos->next)
        {
-         if (NULL == (channel = channels[plugin_count]))
+         if (NULL == (channel = pos->channel))
            continue;
          if ( (-1 != pos->seek_request) &&
               (min_seek <= pos->seek_request) &&

Modified: Extractor/src/main/extractor_datasource.c
===================================================================
--- Extractor/src/main/extractor_datasource.c   2012-07-30 21:59:59 UTC (rev 
22996)
+++ Extractor/src/main/extractor_datasource.c   2012-07-30 22:05:58 UTC (rev 
22997)
@@ -426,7 +426,8 @@
       avail = bfds->buffer_bytes - bfds->buffer_pos;
       if (avail > count)
        avail = count;
-      ASSERT (0 != avail);
+      if (0 == avail)
+       break;
       memcpy (&cbuf[ret], bfds->data + bfds->buffer_pos, avail);
       bfds->buffer_pos += avail;
       count -= avail;
@@ -1137,6 +1138,7 @@
     }
   ds->bfds = bfds;
   ds->fd = -1;
+  ds->cfs = NULL;
   ct = get_compression_type (bfds);
   if ( (COMP_TYPE_ZLIB == ct) ||
        (COMP_TYPE_BZ2 == ct) )