generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/rmdec: Check the return value of av_get_packet()

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-01-18 20:55:49 +01:00
parent 8d7ce5cdb7
commit 65b83ce01b
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavformat/rmdec.c
View File

@ -896,11 +896,14 @@ ff_rm_parse_packet (AVFormatContext *s, AVIOContext *pb,
} else
return -1;
} else {
av_get_packet(pb, pkt, len);
if ((ret = av_get_packet(pb, pkt, len)) < 0)
return ret;
rm_ac3_swap_bytes(st, pkt);
}
} else
av_get_packet(pb, pkt, len);
} else {
if ((ret = av_get_packet(pb, pkt, len)) < 0)
return ret;
}
pkt->stream_index = st->index;
@ -933,9 +936,11 @@ ff_rm_retrieve_cache (AVFormatContext *s, AVIOContext *pb,
av_assert0 (rm->audio_pkt_cnt > 0);
if (ast->deint_id == DEINT_ID_VBRF ||
ast->deint_id == DEINT_ID_VBRS)
av_get_packet(pb, pkt, ast->sub_packet_lengths[ast->sub_packet_cnt - rm->audio_pkt_cnt]);
else {
ast->deint_id == DEINT_ID_VBRS) {
int ret = av_get_packet(pb, pkt, ast->sub_packet_lengths[ast->sub_packet_cnt - rm->audio_pkt_cnt]);
if (ret < 0)
return ret;
} else {
int ret = av_new_packet(pkt, st->codec->block_align);
if (ret < 0)
return ret;