aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVittorio Giovara <vittorio.giovara@gmail.com>2014-02-27 12:06:15 +0100
committerReinhard Tartler <siretart@tauware.de>2014-03-09 17:53:47 -0400
commit416847d19593e87ee1704c26a9a638fd6b0d977c (patch)
treeaec8c092d2be9697df2fc9f5cbf256152e4c473d
parentbd4ad1a1d52b8882df016826b8bdcf7b1009cb97 (diff)
downloadffmpeg-416847d19593e87ee1704c26a9a638fd6b0d977c.tar.gz
vf_frei0r: prevent a segfault when filter parameters are not set
(cherry picked from commit 4e0be9c86f2003dd3ba2eb8fad01e8d0e538075e)
-rw-r--r--libavfilter/vf_frei0r.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavfilter/vf_frei0r.c b/libavfilter/vf_frei0r.c
index 9c6b84b40b..670fa180c7 100644
--- a/libavfilter/vf_frei0r.c
+++ b/libavfilter/vf_frei0r.c
@@ -465,6 +465,10 @@ static int source_config_props(AVFilterLink *outlink)
av_log(ctx, AV_LOG_ERROR, "Impossible to load frei0r instance");
return AVERROR(EINVAL);
}
+ if (!s->params) {
+ av_log(ctx, AV_LOG_ERROR, "frei0r filter parameters not set.\n");
+ return AVERROR(EINVAL);
+ }
return set_params(ctx, s->params);
}