har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavu/opt: avoid accidentally propagating spurious errors

Browse Source 
An error from read_number() is non-fatal here and should not be
forwarded.

(cherry picked from commit 505fea34e53e0459d1ca6604a3f4737f0b90902c)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
Anton Khirnov 2024-09-26 18:08:04 +02:00
parent 55d0c353fe
commit d5c308fcc5
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavutil/opt.c
View File

@ -2343,13 +2343,15 @@ int av_opt_set_array(void *obj, const char *name, int search_flags,
int64_t intnum = 1;
if (val_type == TYPE_BASE(o->type)) {
int err;
ret = opt_copy_elem(obj, val_type, dst, src);
if (ret < 0)
goto fail;
// validate the range for numeric options
ret = read_number(o, dst, &num, &den, &intnum);
if (ret >= 0 && TYPE_BASE(o->type) != AV_OPT_TYPE_FLAGS &&
err = read_number(o, dst, &num, &den, &intnum);
if (err >= 0 && TYPE_BASE(o->type) != AV_OPT_TYPE_FLAGS &&
(!den || o->max * den < num * intnum || o->min * den > num * intnum)) {
num = den ? num * intnum / den : (num && intnum ? INFINITY : NAN);
av_log(obj, AV_LOG_ERROR, "Cannot set array element %u for "