dilim/FFmpeg
1
0 Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-11-06 05:17:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

avutil/dict: copy dictionaries without duplicate keys in linear time

Browse Source 
Timeout Replicated through API

Found during triage/review of OSS-Fuzz issue 561208791

Fixes: Timeout
Fixes: W8DJK4OR7cgk/flat300.bin / gen_flat.py
Fixes: W8DJK4OR7cgk

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer authored and michaelni committed 2026-10-12 23:55:55 +00:00
1 parent 7521ca2ca6
commit 3a7a9e5dd3
1 file changed
+26
Download Patch File Download Diff File Expand all files Collapse all files
libavutil/dict.c
+26
View File
@@ -32,6 +32,7 @@
struct AVDictionary {
int count;
AVDictionaryEntry *elems;
int duplicate_keys;
};
int av_dict_count(const AVDictionary *m)
@@ -154,6 +155,8 @@ int av_dict_set(AVDictionary **pm, const char *key, const char *value,
m->elems[m->count].key = copy_key;
m->elems[m->count].value = copy_value;
m->count++;
if (flags & (AV_DICT_MATCH_CASE | AV_DICT_IGNORE_SUFFIX | AV_DICT_MULTIKEY))
m->duplicate_keys = 1;
} else {
err = 0;
goto end;
@@ -248,6 +251,29 @@ int av_dict_copy(AVDictionary **dst, const AVDictionary *src, int flags)
{
const AVDictionaryEntry *t = NULL;
if (!*dst && src && src->count && !src->duplicate_keys &&
!(flags & AV_DICT_IGNORE_SUFFIX)) {
AVDictionary *m = av_mallocz(sizeof(*m));
if (!m)
return AVERROR(ENOMEM);
m->elems = av_calloc(src->count, sizeof(*m->elems));
if (!m->elems) {
av_free(m);
return AVERROR(ENOMEM);
}
*dst = m;
for (int i = 0; i < src->count; i++) {
m->elems[i].key = av_strdup(src->elems[i].key);
m->elems[i].value = av_strdup(src->elems[i].value);
m->count++;
if (!m->elems[i].key || !m->elems[i].value) {
av_dict_free(dst);
return AVERROR(ENOMEM);
}
}
return 0;
}
while ((t = av_dict_iterate(src, t))) {
int ret = av_dict_set(dst, t->key, t->value, flags);
if (ret < 0)