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

avformat/asfdec: Check av_new_packet()s return code

Browse Source 
Fixes CID1041093

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-20 18:27:25 +02:00
parent 05dd5368a9
commit 2076095549
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/asfdec.c
View File

@ -1195,6 +1195,8 @@ static int asf_parse_packet(AVFormatContext *s, AVIOContext *pb, AVPacket *pkt)
if (asf_st->pkt.size != asf_st->packet_obj_size || if (asf_st->pkt.size != asf_st->packet_obj_size ||
// FIXME is this condition sufficient? // FIXME is this condition sufficient?
asf_st->frag_offset + asf->packet_frag_size > asf_st->pkt.size) { asf_st->frag_offset + asf->packet_frag_size > asf_st->pkt.size) {
int ret;
if (asf_st->pkt.data) { if (asf_st->pkt.data) {
av_log(s, AV_LOG_INFO, av_log(s, AV_LOG_INFO,
"freeing incomplete packet size %d, new %d\n", "freeing incomplete packet size %d, new %d\n",
@ -1203,7 +1205,8 @@ static int asf_parse_packet(AVFormatContext *s, AVIOContext *pb, AVPacket *pkt)
av_free_packet(&asf_st->pkt); av_free_packet(&asf_st->pkt);
} }
/* new packet */ /* new packet */
av_new_packet(&asf_st->pkt, asf_st->packet_obj_size); if ((ret = av_new_packet(&asf_st->pkt, asf_st->packet_obj_size)) < 0)
return ret;
asf_st->seq = asf->packet_seq; asf_st->seq = asf->packet_seq;
if (asf->ts_is_pts) { if (asf->ts_is_pts) {
asf_st->pkt.pts = asf->packet_frag_timestamp - asf->hdr.preroll; asf_st->pkt.pts = asf->packet_frag_timestamp - asf->hdr.preroll;