diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-21 23:47:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-21 23:47:44 +0200 |
| commit | 979062fe2febb502e8b75e944e61673cf70c79b7 (patch) | |
| tree | 625cd7520f4de1607c25ff151146814352624aed | |
| parent | 840bc8e284c8eead7f0f319e846f911dfb3fd48f (diff) | |
| parent | be42c0b8d57fe2ea769892d102ffd5561dc18709 (diff) | |
| download | ffmpeg-979062fe2febb502e8b75e944e61673cf70c79b7.tar.gz | |
Merge commit 'be42c0b8d57fe2ea769892d102ffd5561dc18709'
* commit 'be42c0b8d57fe2ea769892d102ffd5561dc18709':
rmdec: stricter error check to avoid theoretical unitialized use
Conflicts:
libavformat/rmdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/rmdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index 98e773ca44..96b9e7f238 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -969,7 +969,7 @@ static int rm_read_packet(AVFormatContext *s, AVPacket *pkt) st = s->streams[i]; } - if(len<0 || avio_feof(s->pb)) + if (len <= 0 || avio_feof(s->pb)) return AVERROR(EIO); res = ff_rm_parse_packet (s, s->pb, st, st->priv_data, len, pkt, |