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

avformat/mov: use av_freep() to avoid leaving stale pointers in memory

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 383c6a3a07)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-01-06 12:45:25 +01:00
parent c7a2ac6b6b
commit 0d3a07852c
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/mov.c
View File

@@ -1153,7 +1153,7 @@ static int mov_read_wave(MOVContext *c, AVIOContext *pb, MOVAtom atom)
st->codec->codec_id == AV_CODEC_ID_QDMC || st->codec->codec_id == AV_CODEC_ID_QDMC ||
st->codec->codec_id == AV_CODEC_ID_SPEEX) { st->codec->codec_id == AV_CODEC_ID_SPEEX) {
// pass all frma atom to codec, needed at least for QDMC and QDM2 // pass all frma atom to codec, needed at least for QDMC and QDM2
av_free(st->codec->extradata); av_freep(&st->codec->extradata);
if (ff_get_extradata(st->codec, pb, atom.size) < 0) if (ff_get_extradata(st->codec, pb, atom.size) < 0)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} else if (atom.size > 8) { /* to read frma, esds atoms */ } else if (atom.size > 8) { /* to read frma, esds atoms */
@@ -1193,7 +1193,7 @@ static int mov_read_glbl(MOVContext *c, AVIOContext *pb, MOVAtom atom)
av_log(c, AV_LOG_WARNING, "ignoring multiple glbl\n"); av_log(c, AV_LOG_WARNING, "ignoring multiple glbl\n");
return 0; return 0;
} }
av_free(st->codec->extradata); av_freep(&st->codec->extradata);
if (ff_get_extradata(st->codec, pb, atom.size) < 0) if (ff_get_extradata(st->codec, pb, atom.size) < 0)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
@@ -1218,7 +1218,7 @@ static int mov_read_dvc1(MOVContext *c, AVIOContext *pb, MOVAtom atom)
return 0; return 0;
avio_seek(pb, 6, SEEK_CUR); avio_seek(pb, 6, SEEK_CUR);
av_free(st->codec->extradata); av_freep(&st->codec->extradata);
if ((ret = ff_get_extradata(st->codec, pb, atom.size - 7)) < 0) if ((ret = ff_get_extradata(st->codec, pb, atom.size - 7)) < 0)
return ret; return ret;
@@ -1244,7 +1244,7 @@ static int mov_read_strf(MOVContext *c, AVIOContext *pb, MOVAtom atom)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
avio_skip(pb, 40); avio_skip(pb, 40);
av_free(st->codec->extradata); av_freep(&st->codec->extradata);
if (ff_get_extradata(st->codec, pb, atom.size - 40) < 0) if (ff_get_extradata(st->codec, pb, atom.size - 40) < 0)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
return 0; return 0;
@@ -4113,7 +4113,7 @@ static int mov_read_packet(AVFormatContext *s, AVPacket *pkt)
#if CONFIG_DV_DEMUXER #if CONFIG_DV_DEMUXER
if (mov->dv_demux && sc->dv_audio_container) { if (mov->dv_demux && sc->dv_audio_container) {
avpriv_dv_produce_packet(mov->dv_demux, pkt, pkt->data, pkt->size, pkt->pos); avpriv_dv_produce_packet(mov->dv_demux, pkt, pkt->data, pkt->size, pkt->pos);
av_free(pkt->data); av_freep(&pkt->data);
pkt->size = 0; pkt->size = 0;
ret = avpriv_dv_get_packet(mov->dv_demux, pkt); ret = avpriv_dv_get_packet(mov->dv_demux, pkt);
if (ret < 0) if (ret < 0)