aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-07-17 20:27:25 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-07-17 21:13:56 +0200
commit2ea8a480832acad3095783bcb11d5f290bec56cf (patch)
tree9bd7b7a9b92374d28843ae5667752d4a1907bc84 /libavfilter
parent1cdfae0b3e3e5f70ffa5ef4df880ed37fb61d452 (diff)
downloadffmpeg-2ea8a480832acad3095783bcb11d5f290bec56cf.tar.gz
avfilter/af_aresample: Check ff_all_* for allocation failures
Fixes: signal_sigabrt_7ffff70eccc9_498_divx502.avi with memlimit 1572864 Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavfilter')
-rw-r--r--libavfilter/af_aresample.c21
1 files changed, 15 insertions, 6 deletions
diff --git a/libavfilter/af_aresample.c b/libavfilter/af_aresample.c
index 57ac3978be..6cb765df1b 100644
--- a/libavfilter/af_aresample.c
+++ b/libavfilter/af_aresample.c
@@ -87,15 +87,24 @@ static int query_formats(AVFilterContext *ctx)
AVFilterLink *inlink = ctx->inputs[0];
AVFilterLink *outlink = ctx->outputs[0];
- AVFilterFormats *in_formats = ff_all_formats(AVMEDIA_TYPE_AUDIO);
- AVFilterFormats *out_formats;
- AVFilterFormats *in_samplerates = ff_all_samplerates();
- AVFilterFormats *out_samplerates;
- AVFilterChannelLayouts *in_layouts = ff_all_channel_counts();
- AVFilterChannelLayouts *out_layouts;
+ AVFilterFormats *in_formats, *out_formats;
+ AVFilterFormats *in_samplerates, *out_samplerates;
+ AVFilterChannelLayouts *in_layouts, *out_layouts;
+
+ in_formats = ff_all_formats(AVMEDIA_TYPE_AUDIO);
+ if (!in_formats)
+ return AVERROR(ENOMEM);
ff_formats_ref (in_formats, &inlink->out_formats);
+
+ in_samplerates = ff_all_samplerates();
+ if (!in_samplerates)
+ return AVERROR(ENOMEM);
ff_formats_ref (in_samplerates, &inlink->out_samplerates);
+
+ in_layouts = ff_all_channel_counts();
+ if (!in_layouts)
+ return AVERROR(ENOMEM);
ff_channel_layouts_ref(in_layouts, &inlink->out_channel_layouts);
if(out_rate > 0) {