virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avcodec: fix memleak in avcodec_encode_audio2()

Browse Source 
Ensure that padded_frame is freed before returning when needed.
This commit is contained in:
Justin Ruggles 2012-08-23 13:47:25 -04:00
parent c54e00610f
commit 0ccf051a9d
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/utils.c
View File

@ -981,8 +981,10 @@ int attribute_align_arg avcodec_encode_audio2(AVCodecContext *avctx,
avctx->internal->last_audio_frame = 1; avctx->internal->last_audio_frame = 1;
} }
if (frame->nb_samples != avctx->frame_size) if (frame->nb_samples != avctx->frame_size) {
return AVERROR(EINVAL); ret = AVERROR(EINVAL);
goto end;
}
} }
} }
@ -1013,7 +1015,7 @@ int attribute_align_arg avcodec_encode_audio2(AVCodecContext *avctx,
if (ret < 0 || !*got_packet_ptr) { if (ret < 0 || !*got_packet_ptr) {
av_free_packet(avpkt); av_free_packet(avpkt);
av_init_packet(avpkt); av_init_packet(avpkt);
return ret; goto end;
} }
/* NOTE: if we add any audio encoders which output non-keyframe packets, /* 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 */ * here to simplify things */
avpkt->flags |= AV_PKT_FLAG_KEY; avpkt->flags |= AV_PKT_FLAG_KEY;
end:
if (padded_frame) { if (padded_frame) {
av_freep(&padded_frame->data[0]); av_freep(&padded_frame->data[0]);
if (padded_frame->extended_data != padded_frame->data) if (padded_frame->extended_data != padded_frame->data)