vdr_x_demux_control_newpts:

- fix null pointer dereferencing when last element of audio fifo was consumed for video.
- use proper fifos for buffers
- check if fifos exist

1 files changed, 8 insertions, 7 deletions

diff --git a/xine_input_vdr.c b/xine_input_vdr.c
index fb9c87fb..8ce72daf 100644
--- a/xine_input_vdr.c
+++ b/xine_input_vdr.c
@@ -4,7 +4,7 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: xine_input_vdr.c,v 1.93 2007-09-13 21:24:07 phintuka Exp $
+ * $Id: xine_input_vdr.c,v 1.94 2007-09-14 22:56:10 phintuka Exp $
  *
  */
 
@@ -2308,23 +2308,24 @@ static void vdr_x_demux_control_newpts( xine_stream_t *stream, int64_t pts,
 {
   buf_element_t *buf;
 
-  buf = stream->audio_fifo->buffer_pool_try_alloc (stream->audio_fifo);
+  buf = stream->video_fifo ? stream->video_fifo->buffer_pool_try_alloc (stream->video_fifo) : NULL;
   if(buf) {
     buf->type = BUF_CONTROL_NEWPTS;
     buf->decoder_flags = flags;
     buf->disc_off = pts;
     stream->video_fifo->put (stream->video_fifo, buf); 
- } else {
-    LOGMSG("vdr_x_demux_control_newpts BUFFER FULL!");
+  } else {
+    LOGMSG("vdr_x_demux_control_newpts: video fifo full !");
   }
-  if(buf) {
-    buf = stream->audio_fifo->buffer_pool_try_alloc (stream->audio_fifo);
+
+  buf = stream->audio_fifo ? stream->audio_fifo->buffer_pool_try_alloc (stream->audio_fifo) : NULL;
+  if (buf) {
     buf->type = BUF_CONTROL_NEWPTS;
     buf->decoder_flags = flags;
     buf->disc_off = pts;
     stream->audio_fifo->put (stream->audio_fifo, buf);
   } else {
-    LOGMSG("vdr_x_demux_control_newpts BUFFER FULL!");
+    LOGMSG("vdr_x_demux_control_newpts: audio fifo full !");
   }
 }