-fixed

3 files changed, 5 insertions, 3 deletions

diff --git a/src/main/TODO b/src/main/TODO
index b897a54..16348a6 100644
--- a/src/main/TODO
+++ b/src/main/TODO
@@ -3,6 +3,3 @@
 
 * MAX_META_DATA buffer of 32 MB is a bit big as a non-growing default size;
   also, valgrind reports it is leaked even though printf-debugging shows it is not (!?)
-
-* for some reason, if a plugin crashes or something goes wrong (i.e. with a seek),
-  the whole system hangs (not good...)
diff --git a/src/main/extractor.c b/src/main/extractor.c
index b30c249..6fc85b0 100644
--- a/src/main/extractor.c
+++ b/src/main/extractor.c
@@ -446,8 +446,12 @@ do_extract (struct EXTRACTOR_PluginList *plugins,
       /* calculate minimum seek request (or set done=0 to continue here) */
       done = 1;
       min_seek = -1;
+      plugin_count = 0;
       for (pos = plugins; NULL != pos; pos = pos->next)
         {
+          if (NULL == channels[plugin_count])
+            pos->channel = NULL;
+          plugin_count++;
           if ( (1 == pos->round_finished) ||
                (NULL == pos->channel) )
             continue; /* inactive plugin */
diff --git a/src/main/extractor_ipc_gnu.c b/src/main/extractor_ipc_gnu.c
index cae1fe6..69dc185 100644
--- a/src/main/extractor_ipc_gnu.c
+++ b/src/main/extractor_ipc_gnu.c
@@ -468,6 +468,7 @@ EXTRACTOR_IPC_channel_recv_ (struct EXTRACTOR_Channel **channels,
       if ( (-1 == (iret = read (channel->cpipe_out,
                                 &channel->data[channel->size],
                                 MAX_META_DATA - channel->size)) ) ||
+           (0 == iret) ||
            (-1 == (ret = EXTRACTOR_IPC_process_reply_ (channel->plugin,
                                                        channel->data, 
                                                        channel->size + iret,