[FFmpeg-cvslog] avcodec: fix memleak in avcodec_encode_audio2()
Justin Ruggles
git at videolan.org
Sun Sep 23 13:58:49 CEST 2012
ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Thu Aug 23 13:47:25 2012 -0400| [0ccf051a9def7095ac45b1dca427b39bcf15608d] | committer: Justin Ruggles
avcodec: fix memleak in avcodec_encode_audio2()
Ensure that padded_frame is freed before returning when needed.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0ccf051a9def7095ac45b1dca427b39bcf15608d
---
libavcodec/utils.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 8c10e12..b35ef51 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -981,8 +981,10 @@ int attribute_align_arg avcodec_encode_audio2(AVCodecContext *avctx,
avctx->internal->last_audio_frame = 1;
}
- if (frame->nb_samples != avctx->frame_size)
- return AVERROR(EINVAL);
+ if (frame->nb_samples != avctx->frame_size) {
+ ret = AVERROR(EINVAL);
+ goto end;
+ }
}
}
@@ -1013,7 +1015,7 @@ int attribute_align_arg avcodec_encode_audio2(AVCodecContext *avctx,
if (ret < 0 || !*got_packet_ptr) {
av_free_packet(avpkt);
av_init_packet(avpkt);
- return ret;
+ goto end;
}
/* NOTE: if we add any audio encoders which output non-keyframe packets,
@@ -1021,6 +1023,7 @@ int attribute_align_arg avcodec_encode_audio2(AVCodecContext *avctx,
* here to simplify things */
avpkt->flags |= AV_PKT_FLAG_KEY;
+end:
if (padded_frame) {
av_freep(&padded_frame->data[0]);
if (padded_frame->extended_data != padded_frame->data)
More information about the ffmpeg-cvslog
mailing list