From 4ea549d06f4d19fb021b44c08b75e50f2201002a Mon Sep 17 00:00:00 2001 From: nicodvb Date: Sun, 29 Oct 2006 10:33:49 +0000 Subject: [PATCH] fixed mishandling of stream_read() (it doesn't necessarily return -1 in case of error) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20502 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demux_ts.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libmpdemux/demux_ts.c b/libmpdemux/demux_ts.c index 4fd1dc23ce..a2a5a4a193 100644 --- a/libmpdemux/demux_ts.c +++ b/libmpdemux/demux_ts.c @@ -2827,10 +2827,10 @@ static int ts_parse(demuxer_t *demuxer , ES_stream_t *es, unsigned char *packet, p = &((*dp)->buffer[*dp_offset]); } - buf_size = stream_read(stream, p, buf_size); - if(buf_size==-1) + len = stream_read(stream, p, buf_size); + if(len < buf_size) { - mp_msg(MSGT_DEMUX, MSGL_DBG2, "\r\nts_parse() couldn't read data\r\n"); + mp_msg(MSGT_DEMUX, MSGL_DBG2, "\r\nts_parse() couldn't read enough data: %d < %d\r\n", len, buf_size); continue; } stream_skip(stream, junk);