diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2012-08-23 13:47:25 -0400 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2012-09-22 09:24:24 -0400 |
| commit | 0ccf051a9def7095ac45b1dca427b39bcf15608d (patch) | |
| tree | 169b7064293438436359694faa647c04d0917ff7 | |
| parent | c54e00610f20d2342fe9b17a5460abfbd411c8fb (diff) | |
| download | ffmpeg-0ccf051a9def7095ac45b1dca427b39bcf15608d.tar.gz | |
avcodec: fix memleak in avcodec_encode_audio2()
Ensure that padded_frame is freed before returning when needed.
| -rw-r--r-- | libavcodec/utils.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 8c10e12c3c..b35ef51ac0 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) |