sysutils/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-10-24 02:09:03 +03:00
Code Activity

avfilter/vf_libvmaf: reject a feature config without a name

Browse Source 
This is not a security issue.

Fixes: 1QLxiyziAd9N
Fixes: swarm-NULL-feature_name-dereferenced-in-parse_features-129e69
Regression since: 3d29724c00
NULL feature name Replicated through UnModified FFmpeg (the error message read "(null)")
Found-by: zhang xingxing <2388969553@qq.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
zhang xingxing
2026-10-13 06:40:15 +02:00
committed by michaelni
parent ebd451b62f
commit 5a2f87c190
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libavfilter/vf_libvmaf.c
View File

@@ -239,30 +239,36 @@ static int parse_features(AVFilterContext *ctx)
}
for (unsigned i = 0; i < dict_cnt; i++) {
char *feature_name = NULL;
const AVDictionaryEntry *name = av_dict_get(dict[i], "name", NULL,
AV_DICT_MATCH_CASE);
VmafFeatureDictionary *feature_opts_dict = NULL;
const AVDictionaryEntry *e = NULL;
if (!name) {
av_log(ctx, AV_LOG_ERROR, "feature without a name: %s\n",
s->feature_cfg);
err = AVERROR(EINVAL);
goto exit;
}
while (e = av_dict_iterate(dict[i], e)) {
if (!strcmp(e->key, "name")) {
feature_name = e->value;
if (!strcmp(e->key, "name"))
continue;
}
err = vmaf_feature_dictionary_set(&feature_opts_dict, e->key,
e->value);
if (err) {
av_log(ctx, AV_LOG_ERROR,
"could not set feature option: %s.%s=%s\n",
feature_name, e->key, e->value);
name->value, e->key, e->value);
goto exit;
}
}
err = vmaf_use_feature(s->vmaf, feature_name, feature_opts_dict);
err = vmaf_use_feature(s->vmaf, name->value, feature_opts_dict);
if (err) {
av_log(ctx, AV_LOG_ERROR,
"problem during vmaf_use_feature: %s\n", feature_name);
"problem during vmaf_use_feature: %s\n", name->value);
goto exit;
}
}