Mercurial > mplayer.hg

changeset 24963:0a733c2c577e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix possible null-pointer-dereference in stream_fill_buffer().
author cehoyos
date Thu, 08 Nov 2007 23:07:19 +0000
parents fb50e37df836
children 195a578e07d4
files stream/stream.c
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/stream/stream.c	Thu Nov 08 23:05:54 2007 +0000
+++ b/stream/stream.c	Thu Nov 08 23:07:19 2007 +0000
@@ -251,7 +251,7 @@
   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;