summaryrefslogtreecommitdiff
path: root/libavfilter/buffersink.c
diff options
context:
space:
mode:
authorNicolas George <nicolas.george@normalesup.org>2013-04-21 15:33:18 +0200
committerNicolas George <nicolas.george@normalesup.org>2013-04-21 16:11:36 +0200
commitfd7a7e11b94b12259c6f1e375da15298cbc37e83 (patch)
tree4d66576e73eb8194e6b6f15262ba4ea01379f44b /libavfilter/buffersink.c
parentb57c23f8c85c58c29343ed415e0cf2b4fd1a81d8 (diff)
lavfi/buffersink: fix possible leaks after allocation failures.
Should fix Coverity CID 1005313, 1005314, 1005315.
Diffstat (limited to 'libavfilter/buffersink.c')
-rw-r--r--libavfilter/buffersink.c20
1 files changed, 15 insertions, 5 deletions
diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c
index 14ead2bb0c..234027d2fa 100644
--- a/libavfilter/buffersink.c
+++ b/libavfilter/buffersink.c
@@ -401,8 +401,10 @@ static int vsink_query_formats(AVFilterContext *ctx)
CHECK_LIST_SIZE(pixel_fmts)
if (buf->pixel_fmts_size) {
for (i = 0; i < NB_ITEMS(buf->pixel_fmts); i++)
- if ((ret = ff_add_format(&formats, buf->pixel_fmts[i])) < 0)
+ if ((ret = ff_add_format(&formats, buf->pixel_fmts[i])) < 0) {
+ ff_formats_unref(&formats);
return ret;
+ }
ff_set_common_formats(ctx, formats);
} else {
ff_default_query_formats(ctx);
@@ -443,19 +445,25 @@ static int asink_query_formats(AVFilterContext *ctx)
if (buf->sample_fmts_size) {
for (i = 0; i < NB_ITEMS(buf->sample_fmts); i++)
- if ((ret = ff_add_format(&formats, buf->sample_fmts[i])) < 0)
+ if ((ret = ff_add_format(&formats, buf->sample_fmts[i])) < 0) {
+ ff_formats_unref(&formats);
return ret;
+ }
ff_set_common_formats(ctx, formats);
}
if (buf->channel_layouts_size || buf->channel_counts_size ||
buf->all_channel_counts) {
for (i = 0; i < NB_ITEMS(buf->channel_layouts); i++)
- if ((ret = ff_add_channel_layout(&layouts, buf->channel_layouts[i])) < 0)
+ if ((ret = ff_add_channel_layout(&layouts, buf->channel_layouts[i])) < 0) {
+ ff_channel_layouts_unref(&layouts);
return ret;
+ }
for (i = 0; i < NB_ITEMS(buf->channel_counts); i++)
- if ((ret = ff_add_channel_layout(&layouts, FF_COUNT2LAYOUT(buf->channel_counts[i]))) < 0)
+ if ((ret = ff_add_channel_layout(&layouts, FF_COUNT2LAYOUT(buf->channel_counts[i]))) < 0) {
+ ff_channel_layouts_unref(&layouts);
return ret;
+ }
if (buf->all_channel_counts) {
if (layouts)
av_log(ctx, AV_LOG_WARNING,
@@ -469,8 +477,10 @@ static int asink_query_formats(AVFilterContext *ctx)
if (buf->sample_rates_size) {
formats = NULL;
for (i = 0; i < NB_ITEMS(buf->sample_rates); i++)
- if ((ret = ff_add_format(&formats, buf->sample_rates[i])) < 0)
+ if ((ret = ff_add_format(&formats, buf->sample_rates[i])) < 0) {
+ ff_formats_unref(&formats);
return ret;
+ }
ff_set_common_samplerates(ctx, formats);
}