Fixes bad error checking on read errors.

Don't use "p_block->i_buffer = read(...)", i_buffer is unsigned so you
won't catch read errors and will end up crashing using a 4GB buffer
instead. This fixes a DVB segv I was seeing.

diff --git a/modules/access/dvb/access.c b/modules/access/dvb/access.c
index 0743147aa0aa711f704a162e91ae204704a68f5d..6dc9bed70ed8e5d0844fe54d55da1431faa9733f 100644 (file)
--- a/modules/access/dvb/access.c
+++ b/modules/access/dvb/access.c
@@ -494,13 +494,14 @@ static block_t *Block( access_t *p_access )
         {
             p_block = block_New( p_access,
                                  p_sys->i_read_once * TS_PACKET_SIZE );
-            if( ( p_block->i_buffer = read( p_sys->i_handle, p_block->p_buffer,
+            if( ( i_ret = read( p_sys->i_handle, p_block->p_buffer,
                                 p_sys->i_read_once * TS_PACKET_SIZE ) ) <= 0 )
             {
                 msg_Warn( p_access, "read failed (%m)" );
                 block_Release( p_block );
                 continue;
             }
+            p_block->i_buffer = i_ret;
             break;
         }
     }

diff --git a/modules/access_filter/timeshift.c b/modules/access_filter/timeshift.c
index 924744a5aff2ebfb7497f7531f25de3a2e8c2363..b90e26131028d32bfb1d8330f1e2309c669aabea 100644 (file)
--- a/modules/access_filter/timeshift.c
+++ b/modules/access_filter/timeshift.c
@@ -285,16 +285,17 @@ static void* Thread( vlc_object_t* p_this )
         }
         else
         {
-            if( ( p_block = block_New( p_access, 2048 ) ) == NULL ) break;
+            int i_read;
 
-            p_block->i_buffer =
-                p_src->pf_read( p_src, p_block->p_buffer, 2048 );
+            if( ( p_block = block_New( p_access, 2048 ) ) == NULL ) break;
 
-            if( p_block->i_buffer <= 0 )
+            i_read = p_src->pf_read( p_src, p_block->p_buffer, 2048 );
+            if( i_read <= 0 )
             {
               block_Release( p_block );
               p_block = NULL;
             }
+            p_block->i_buffer = i_read;
         }
 
         if( p_block == NULL )

diff --git a/modules/demux/mod.c b/modules/demux/mod.c
index 126119927982e59ddd794ffef96e1981934ec43e..399bc00ab9f70d1294e4e1c17527160879b80393 100644 (file)
--- a/modules/demux/mod.c
+++ b/modules/demux/mod.c
@@ -273,16 +273,18 @@ static int Demux( demux_t *p_demux )
     block_t     *p_frame;
     int         i_bk = ( p_sys->fmt.audio.i_bitspersample / 8 ) *
                        p_sys->fmt.audio.i_channels;
+    int         i_read;
 
     p_frame = block_New( p_demux, p_sys->fmt.audio.i_rate / 10 * i_bk );
 
-    p_frame->i_buffer = ModPlug_Read( p_sys->f, p_frame->p_buffer, p_frame->i_buffer );
-    if( p_frame->i_buffer <= 0 )
+    i_read = ModPlug_Read( p_sys->f, p_frame->p_buffer, p_frame->i_buffer );
+    if( i_read <= 0 )
     {
         /* EOF */
         block_Release( p_frame );
         return 0;
     }
+    p_frame->i_buffer = i_read;
 
     /* Set PCR */
     es_out_Control( p_demux->out, ES_OUT_SET_PCR, (int64_t)p_sys->i_time );

diff --git a/modules/demux/vobsub.c b/modules/demux/vobsub.c
index 64c3570dd4d35edf09dc2b9a385c572f7decfc54..e52993992106881a27430c3cf9e3e23a28a5105a 100644 (file)
--- a/modules/demux/vobsub.c
+++ b/modules/demux/vobsub.c
@@ -336,7 +336,7 @@ static int Demux( demux_t *p_demux )
 {
     demux_sys_t *p_sys = p_demux->p_sys;
     int64_t i_maxdate;
-    int i;
+    int i, i_read;
 
     for( i = 0; i < p_sys->i_tracks; i++ )
     {
@@ -382,13 +382,14 @@ static int Demux( demux_t *p_demux )
             }
 
             /* read data */
-            p_block->i_buffer = stream_Read( p_sys->p_vobsub_stream, p_block->p_buffer, i_size );
-            if( p_block->i_buffer <= 6 )
+            i_read = stream_Read( p_sys->p_vobsub_stream, p_block->p_buffer, i_size );
+            if( i_read <= 6 )
             {
                 block_Release( p_block );
                 tk.i_current_subtitle++;
                 continue;
             }
+            p_block->i_buffer = i_read;
 
             /* pts */
             p_block->i_pts = tk.p_subtitles[tk.i_current_subtitle].i_start;

diff --git a/src/input/stream.c b/src/input/stream.c
index 5cb4aa2c6151998fb1f78beffcadcd8923142c54..228cfc895ec1fbdbf5425df48b27dafb2415a645 100644 (file)
--- a/src/input/stream.c
+++ b/src/input/stream.c
@@ -2124,9 +2124,10 @@ block_t *stream_Block( stream_t *s, int i_size )
     block_t *p_bk = block_New( s, i_size );
     if( p_bk )
     {
-        p_bk->i_buffer = stream_Read( s, p_bk->p_buffer, i_size );
-        if( p_bk->i_buffer > 0 )
+        int i_read = stream_Read( s, p_bk->p_buffer, i_size );
+        if( i_read > 0 )
         {
+            p_bk->i_buffer = i_read;
             return p_bk;
         }
         block_Release( p_bk );