[Swfdec-commits] Branch '0.8' - swfdec-gtk/swfdec_playback_alsa.c

Benjamin Otte company at kemper.freedesktop.org
Thu Oct 16 04:12:24 PDT 2008


 swfdec-gtk/swfdec_playback_alsa.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 3e8e0806329734d407a8ef7eda72d6b6ba05725c
Author: Benjamin Otte <otte at gnome.org>
Date:   Thu Oct 16 12:04:51 2008 +0200

    fix potential deadlock
    
    This could happen when a 0-byte sound stream was encountered and the
    stream was finished before it was properly setup. This would cause setup
    to be restarted causing an infinite loop.

diff --git a/swfdec-gtk/swfdec_playback_alsa.c b/swfdec-gtk/swfdec_playback_alsa.c
index af83c9f..733c94a 100644
--- a/swfdec-gtk/swfdec_playback_alsa.c
+++ b/swfdec-gtk/swfdec_playback_alsa.c
@@ -173,9 +173,12 @@ try_write_so_pa_gets_it (Stream *stream)
     stream->offset += step;
   }
 
-  if (finish)
+  if (finish) {
     swfdec_playback_stream_remove_handlers (stream);
-  return TRUE;
+    return FALSE;
+  } else {
+    return TRUE;
+  }
 #undef STEP
 }
 


More information about the Swfdec-commits mailing list