RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

bethsoftvid: simplify return handling 

Fixes a double free in case of av_packet_new_side_data() failure.
This commit is contained in:
Vittorio Giovara 2014-10-29 17:02:27 +00:00
parent e9ba309831
commit 84bf64d359
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/bethsoftvid.c
View File

@ -177,7 +177,6 @@ static int read_frame(BVID_DemuxContext *vid, AVIOContext *pb, AVPacket *pkt,
if ((ret = av_new_packet(pkt, vidbuf_nbytes)) < 0) if ((ret = av_new_packet(pkt, vidbuf_nbytes)) < 0)
goto fail; goto fail;
memcpy(pkt->data, vidbuf_start, vidbuf_nbytes); memcpy(pkt->data, vidbuf_start, vidbuf_nbytes);
av_free(vidbuf_start);
pkt->pos = position; pkt->pos = position;
pkt->stream_index = vid->video_index; 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 vid->nframes--; // used to check if all the frames were read
return 0;
fail: fail:
av_free(vidbuf_start); av_free(vidbuf_start);
return ret; return ret;