highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavu: Check av_dict_set allocations

Browse Source 
Bug-Id: CID 1257772
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
This commit is contained in:
Luca Barbato 2014-12-16 14:21:20 +01:00 committed by Vittorio Giovara
parent 6996fd204a
commit 1279221cc4
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavutil/dict.c
View File

@ -71,9 +71,12 @@ int av_dict_set(AVDictionary **pm, const char *key, const char *value,
AVDictionary *m = *pm; AVDictionary *m = *pm;
AVDictionaryEntry *tag = av_dict_get(m, key, NULL, flags); AVDictionaryEntry *tag = av_dict_get(m, key, NULL, flags);
char *oldval = NULL; char *oldval = NULL;
int allocated = !!m;
if (!m) if (!m)
m = *pm = av_mallocz(sizeof(*m)); m = *pm = av_mallocz(sizeof(*m));
if (!m)
return AVERROR(ENOMEM);
if (tag) { if (tag) {
if (flags & AV_DICT_DONT_OVERWRITE) { if (flags & AV_DICT_DONT_OVERWRITE) {
@ -88,12 +91,14 @@ int av_dict_set(AVDictionary **pm, const char *key, const char *value,
av_free(tag->key); av_free(tag->key);
*tag = m->elems[--m->count]; *tag = m->elems[--m->count];
} else { } else {
AVDictionaryEntry *tmp = av_realloc(m->elems, int ret = av_reallocp_array(&m->elems,
(m->count + 1) * sizeof(*m->elems)); m->count + 1, sizeof(*m->elems));
if (tmp) if (ret < 0) {
m->elems = tmp; if (allocated)
else av_freep(pm);
return AVERROR(ENOMEM);
return ret;
}
} }
if (value) { if (value) {
if (flags & AV_DICT_DONT_STRDUP_KEY) if (flags & AV_DICT_DONT_STRDUP_KEY)