Commit 65b83ce0 authored by Michael Niedermayer's avatar Michael Niedermayer

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

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 8d7ce5cd
...@@ -896,11 +896,14 @@ ff_rm_parse_packet (AVFormatContext *s, AVIOContext *pb, ...@@ -896,11 +896,14 @@ ff_rm_parse_packet (AVFormatContext *s, AVIOContext *pb,
} else } else
return -1; return -1;
} else { } else {
av_get_packet(pb, pkt, len); if ((ret = av_get_packet(pb, pkt, len)) < 0)
return ret;
rm_ac3_swap_bytes(st, pkt); rm_ac3_swap_bytes(st, pkt);
} }
} else } else {
av_get_packet(pb, pkt, len); if ((ret = av_get_packet(pb, pkt, len)) < 0)
return ret;
}
pkt->stream_index = st->index; pkt->stream_index = st->index;
...@@ -933,9 +936,11 @@ ff_rm_retrieve_cache (AVFormatContext *s, AVIOContext *pb, ...@@ -933,9 +936,11 @@ ff_rm_retrieve_cache (AVFormatContext *s, AVIOContext *pb,
av_assert0 (rm->audio_pkt_cnt > 0); av_assert0 (rm->audio_pkt_cnt > 0);
if (ast->deint_id == DEINT_ID_VBRF || if (ast->deint_id == DEINT_ID_VBRF ||
ast->deint_id == DEINT_ID_VBRS) ast->deint_id == DEINT_ID_VBRS) {
av_get_packet(pb, pkt, ast->sub_packet_lengths[ast->sub_packet_cnt - rm->audio_pkt_cnt]); int ret = av_get_packet(pb, pkt, ast->sub_packet_lengths[ast->sub_packet_cnt - rm->audio_pkt_cnt]);
else { if (ret < 0)
return ret;
} else {
int ret = av_new_packet(pkt, st->codec->block_align); int ret = av_new_packet(pkt, st->codec->block_align);
if (ret < 0) if (ret < 0)
return ret; return ret;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment