diff options
| author | cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-11-08 23:07:19 +0000 |
|---|---|---|
| committer | cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-11-08 23:07:19 +0000 |
| commit | 4be2fcb25e8b38b889277ccd20c097bcd3c52db3 (patch) | |
| tree | b5ecfe5bad3d8e2075a1958b434294cdb09b3fa4 /stream/stream.c | |
| parent | 2fed92a16794673f8e752774b4c28ffc9911ebfc (diff) | |
| download | mpv-4be2fcb25e8b38b889277ccd20c097bcd3c52db3.tar.bz2 mpv-4be2fcb25e8b38b889277ccd20c097bcd3c52db3.tar.xz | |
Fix possible null-pointer-dereference in stream_fill_buffer().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24991 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream/stream.c')
| -rw-r--r-- | stream/stream.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |