From 4be2fcb25e8b38b889277ccd20c097bcd3c52db3 Mon Sep 17 00:00:00 2001 From: cehoyos Date: Thu, 8 Nov 2007 23:07:19 +0000 Subject: Fix possible null-pointer-dereference in stream_fill_buffer(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24991 b3059339-0415-0410-9bf9-f77b7e298cf2 --- stream/stream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'stream/stream.c') diff --git a/stream/stream.c b/stream/stream.c index 34d95205a1..450360f182 100644 --- a/stream/stream.c +++ b/stream/stream.c @@ -251,7 +251,7 @@ int stream_fill_buffer(stream_t *s){ switch(s->type){ case STREAMTYPE_STREAM: #ifdef MPLAYER_NETWORK - if( s->streaming_ctrl!=NULL ) { + if( s->streaming_ctrl!=NULL && s->streaming_ctrl->streaming_read ) { len=s->streaming_ctrl->streaming_read(s->fd,s->buffer,STREAM_BUFFER_SIZE, s->streaming_ctrl);break; } else { len=read(s->fd,s->buffer,STREAM_BUFFER_SIZE);break; -- cgit v1.2.3