@@ -142,6 +142,11 @@ struct AVFormatInternal {
* Prefer the codec framerate for avg_frame_rate computation.
*/
int prefer_codec_framerate;
+
+ /**
+ * no child has a metadata AVOption, this allows not redoing the very slow search
+ */
+ int no_child_metadata;
};
struct AVStreamInternal {
@@ -1678,12 +1678,16 @@ FF_ENABLE_DEPRECATION_WARNINGS
}
}
- av_opt_get_dict_val(s, "metadata", AV_OPT_SEARCH_CHILDREN, &metadata);
- if (metadata) {
- s->event_flags |= AVFMT_EVENT_FLAG_METADATA_UPDATED;
- av_dict_copy(&s->metadata, metadata, 0);
- av_dict_free(&metadata);
- av_opt_set_dict_val(s, "metadata", NULL, AV_OPT_SEARCH_CHILDREN);
+ if (!s->internal->no_child_metadata) {
+ int ret = av_opt_get_dict_val(s, "metadata", AV_OPT_SEARCH_CHILDREN, &metadata);
+ if (metadata) {
+ s->event_flags |= AVFMT_EVENT_FLAG_METADATA_UPDATED;
+ av_dict_copy(&s->metadata, metadata, 0);
+ av_dict_free(&metadata);
+ av_opt_set_dict_val(s, "metadata", NULL, AV_OPT_SEARCH_CHILDREN);
+ }
+ if (ret == AVERROR_OPTION_NOT_FOUND)
+ s->internal->no_child_metadata = 1;
}
#if FF_API_LAVF_AVCTX
Fixes: Timeout Fixes: 26485/clusterfuzz-testcase-minimized-ffmpeg_dem_IFF_fuzzer-5126561373880320 Not tested due to lack of a testcase for the metadata transfer code Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavformat/internal.h | 5 +++++ libavformat/utils.c | 16 ++++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-)