Module: libav Branch: master Commit: 84bf64d3598c98a748e609195358ea04b0cfd140
Author: Vittorio Giovara <[email protected]> Committer: Vittorio Giovara <[email protected]> Date: Wed Oct 29 17:02:27 2014 +0000 bethsoftvid: simplify return handling Fixes a double free in case of av_packet_new_side_data() failure. --- libavformat/bethsoftvid.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavformat/bethsoftvid.c b/libavformat/bethsoftvid.c index 85abf25..135a3c4 100644 --- a/libavformat/bethsoftvid.c +++ b/libavformat/bethsoftvid.c @@ -177,7 +177,6 @@ static int read_frame(BVID_DemuxContext *vid, AVIOContext *pb, AVPacket *pkt, if ((ret = av_new_packet(pkt, vidbuf_nbytes)) < 0) goto fail; memcpy(pkt->data, vidbuf_start, vidbuf_nbytes); - av_free(vidbuf_start); pkt->pos = position; pkt->stream_index = vid->video_index; @@ -198,7 +197,6 @@ static int read_frame(BVID_DemuxContext *vid, AVIOContext *pb, AVPacket *pkt, } vid->nframes--; // used to check if all the frames were read - return 0; fail: av_free(vidbuf_start); return ret; _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
