mirror of https://git.ffmpeg.org/ffmpeg.git
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>
This commit is contained in:
commit
979062fe2f
|
@ -969,7 +969,7 @@ static int rm_read_packet(AVFormatContext *s, AVPacket *pkt)
|
||||||
st = s->streams[i];
|
st = s->streams[i];
|
||||||
}
|
}
|
||||||
|
|
||||||
if(len<0 || avio_feof(s->pb))
|
if (len <= 0 || avio_feof(s->pb))
|
||||||
return AVERROR(EIO);
|
return AVERROR(EIO);
|
||||||
|
|
||||||
res = ff_rm_parse_packet (s, s->pb, st, st->priv_data, len, pkt,
|
res = ff_rm_parse_packet (s, s->pb, st, st->priv_data, len, pkt,
|
||||||
|
|
Loading…
Reference in New Issue