[FFmpeg-cvslog] lavfi/unsharp: clarify invalid filter param constraints
Stefano Sabatini
git at videolan.org
Sun Apr 2 18:08:22 EEST 2023
ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Sat Mar 25 17:17:37 2023 +0100| [9d140ecaf80762aa13a71ea528ec4431e0355ed1] | committer: Stefano Sabatini
lavfi/unsharp: clarify invalid filter param constraints
Clarify failure in case of x/y building a too big matrix.
Example:
$ ffmpeg -hide_banner -f lavfi -i color=c=white:size=640x360,unsharp=lx=5:ly=23 -f null -t 1 -
[Parsed_unsharp_1 @ 0x5650e1c30240] luma matrix size (lx/2+ly/2)*2=26 greater than maximum value 25
color=c=white:size=640x360,unsharp=lx=5:ly=23: Invalid argument
Fix trac issue:
http://trac.ffmpeg.org/ticket/6033
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9d140ecaf80762aa13a71ea528ec4431e0355ed1
---
libavfilter/vf_unsharp.c | 30 ++++++++++++++++++++++--------
1 file changed, 22 insertions(+), 8 deletions(-)
diff --git a/libavfilter/vf_unsharp.c b/libavfilter/vf_unsharp.c
index e88e732c9e..5e17ebce1e 100644
--- a/libavfilter/vf_unsharp.c
+++ b/libavfilter/vf_unsharp.c
@@ -171,7 +171,10 @@ static int apply_unsharp_c(AVFilterContext *ctx, AVFrame *in, AVFrame *out)
return 0;
}
-static void set_filter_param(UnsharpFilterParam *fp, int msize_x, int msize_y, float amount)
+#define MAX_SCALEBITS 25
+
+static int set_filter_param(AVFilterContext *ctx, const char *name, const char *short_name,
+ UnsharpFilterParam *fp, int msize_x, int msize_y, float amount)
{
fp->msize_x = msize_x;
fp->msize_y = msize_y;
@@ -181,20 +184,31 @@ static void set_filter_param(UnsharpFilterParam *fp, int msize_x, int msize_y, f
fp->steps_y = msize_y / 2;
fp->scalebits = (fp->steps_x + fp->steps_y) * 2;
fp->halfscale = 1 << (fp->scalebits - 1);
+
+ if (fp->scalebits > MAX_SCALEBITS) {
+ av_log(ctx, AV_LOG_ERROR, "%s matrix size (%sx/2+%sy/2)*2=%d greater than maximum value %d\n",
+ name, short_name, short_name, fp->scalebits, MAX_SCALEBITS);
+ return AVERROR(EINVAL);
+ }
+
+ return 0;
}
static av_cold int init(AVFilterContext *ctx)
{
UnsharpContext *s = ctx->priv;
+ int ret;
- set_filter_param(&s->luma, s->lmsize_x, s->lmsize_y, s->lamount);
- set_filter_param(&s->chroma, s->cmsize_x, s->cmsize_y, s->camount);
- set_filter_param(&s->alpha, s->amsize_x, s->amsize_y, s->aamount);
+#define SET_FILTER_PARAM(name_, short_) \
+ ret = set_filter_param(ctx, #name_, #short_, &s->name_, \
+ s->short_##msize_x, s->short_##msize_y, s->short_##amount); \
+ if (ret < 0) \
+ return ret; \
+
+ SET_FILTER_PARAM(luma, l);
+ SET_FILTER_PARAM(chroma, c);
+ SET_FILTER_PARAM(alpha, a);
- if (s->luma.scalebits >= 26 || s->chroma.scalebits >= 26 || s->alpha.scalebits >= 26) {
- av_log(ctx, AV_LOG_ERROR, "luma or chroma or alpha matrix size too big\n");
- return AVERROR(EINVAL);
- }
s->apply_unsharp = apply_unsharp_c;
return 0;
}
More information about the ffmpeg-cvslog
mailing list