virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

swresample/swresample: Cleanup on init failure.

Browse Source 
This avoids leaks if the user doest call swr_close() after a failed init

Found-by: James Almer <jamrial@gmail.com>
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-06-04 03:47:55 +02:00
parent cc17b43d8d
commit c3f87f7545
1 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
libswresample/swresample.c
View File

@@ -266,7 +266,8 @@ av_cold int swr_init(struct SwrContext *s){
&& s->int_sample_fmt != AV_SAMPLE_FMT_DBLP && s->int_sample_fmt != AV_SAMPLE_FMT_DBLP
&& s->resample){ && s->resample){
av_log(s, AV_LOG_ERROR, "Resampling only supported with internal s16/s32/flt/dbl\n"); av_log(s, AV_LOG_ERROR, "Resampling only supported with internal s16/s32/flt/dbl\n");
return -1; ret = AVERROR(EINVAL);
goto fail;
} }
#define RSC 1 //FIXME finetune #define RSC 1 //FIXME finetune
@@ -280,24 +281,28 @@ av_cold int swr_init(struct SwrContext *s){
if(!s-> in.ch_count){ if(!s-> in.ch_count){
av_assert0(!s->in_ch_layout); av_assert0(!s->in_ch_layout);
av_log(s, AV_LOG_ERROR, "Input channel count and layout are unset\n"); av_log(s, AV_LOG_ERROR, "Input channel count and layout are unset\n");
return -1; ret = AVERROR(EINVAL);
goto fail;
} }
av_get_channel_layout_string(l1, sizeof(l1), s-> in.ch_count, s-> in_ch_layout); av_get_channel_layout_string(l1, sizeof(l1), s-> in.ch_count, s-> in_ch_layout);
av_get_channel_layout_string(l2, sizeof(l2), s->out.ch_count, s->out_ch_layout); av_get_channel_layout_string(l2, sizeof(l2), s->out.ch_count, s->out_ch_layout);
if (s->out_ch_layout && s->out.ch_count != av_get_channel_layout_nb_channels(s->out_ch_layout)) { if (s->out_ch_layout && s->out.ch_count != av_get_channel_layout_nb_channels(s->out_ch_layout)) {
av_log(s, AV_LOG_ERROR, "Output channel layout %s mismatches specified channel count %d\n", l2, s->out.ch_count); av_log(s, AV_LOG_ERROR, "Output channel layout %s mismatches specified channel count %d\n", l2, s->out.ch_count);
return AVERROR(EINVAL); ret = AVERROR(EINVAL);
goto fail;
} }
if (s->in_ch_layout && s->used_ch_count != av_get_channel_layout_nb_channels(s->in_ch_layout)) { if (s->in_ch_layout && s->used_ch_count != av_get_channel_layout_nb_channels(s->in_ch_layout)) {
av_log(s, AV_LOG_ERROR, "Input channel layout %s mismatches specified channel count %d\n", l1, s->used_ch_count); av_log(s, AV_LOG_ERROR, "Input channel layout %s mismatches specified channel count %d\n", l1, s->used_ch_count);
return AVERROR(EINVAL); ret = AVERROR(EINVAL);
goto fail;
} }
if ((!s->out_ch_layout || !s->in_ch_layout) && s->used_ch_count != s->out.ch_count && !s->rematrix_custom) { if ((!s->out_ch_layout || !s->in_ch_layout) && s->used_ch_count != s->out.ch_count && !s->rematrix_custom) {
av_log(s, AV_LOG_ERROR, "Rematrix is needed between %s and %s " av_log(s, AV_LOG_ERROR, "Rematrix is needed between %s and %s "
"but there is not enough information to do it\n", l1, l2); "but there is not enough information to do it\n", l1, l2);
return -1; ret = AVERROR(EINVAL);
goto fail;
} }
av_assert0(s->used_ch_count); av_assert0(s->used_ch_count);
@@ -319,8 +324,10 @@ av_assert0(s->out.ch_count);
s->out_convert= swri_audio_convert_alloc(s->out_sample_fmt, s->out_convert= swri_audio_convert_alloc(s->out_sample_fmt,
s->int_sample_fmt, s->out.ch_count, NULL, 0); s->int_sample_fmt, s->out.ch_count, NULL, 0);
if (!s->in_convert || !s->out_convert) if (!s->in_convert || !s->out_convert) {
return AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto fail;
}
s->postin= s->in; s->postin= s->in;
s->preout= s->out; s->preout= s->out;
@@ -347,12 +354,19 @@ av_assert0(s->out.ch_count);
} }
if ((ret = swri_dither_init(s, s->out_sample_fmt, s->int_sample_fmt)) < 0) if ((ret = swri_dither_init(s, s->out_sample_fmt, s->int_sample_fmt)) < 0)
return ret; goto fail;
if(s->rematrix || s->dither.method) if(s->rematrix || s->dither.method) {
return swri_rematrix_init(s); ret = swri_rematrix_init(s);
if (ret < 0)
goto fail;
}
return 0; return 0;
fail:
swr_close(s);
return ret;
} }
int swri_realloc_audio(AudioData *a, int count){ int swri_realloc_audio(AudioData *a, int count){