diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-17 13:44:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-17 13:44:37 +0100 |
| commit | 2dc9bcad7d57f70181ffa5c1804d1426afb50346 (patch) | |
| tree | 217c206aaa56b91e10384ba1ce4e6645a7c0f5d6 | |
| parent | b454c64e0311d813fef9c22cf34f83c2ce77ab23 (diff) | |
| parent | b805c725a31f6cb05c488e485eb6ab370a851633 (diff) | |
| download | ffmpeg-2dc9bcad7d57f70181ffa5c1804d1426afb50346.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
idcin: fix memleaks in idcin_read_packet()
Conflicts:
libavformat/idcin.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/idcin.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/idcin.c b/libavformat/idcin.c index 237d6851dc..c32607def2 100644 --- a/libavformat/idcin.c +++ b/libavformat/idcin.c @@ -321,8 +321,10 @@ static int idcin_read_packet(AVFormatContext *s, pal = av_packet_new_side_data(pkt, AV_PKT_DATA_PALETTE, AVPALETTE_SIZE); - if (!pal) + if (!pal) { + av_free_packet(pkt); return AVERROR(ENOMEM); + } memcpy(pal, palette, AVPALETTE_SIZE); pkt->flags |= AV_PKT_FLAG_KEY; } |