Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

avutil/dict: Use av_freep() to avoid leaving stale pointers in memory

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
pull/101/head
Michael Niedermayer 10 years ago
parent 9e89347329
commit 336bb3f706
1 changed files with 5 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      libavutil/dict.c

10
libavutil/dict.c
Unescape View File

@ -120,7 +120,7 @@ int av_dict_set(AVDictionary **pm, const char *key, const char *value,
m->count++; m->count++;
} }
if (!m->count) { if (!m->count) {
av_free(m->elems); av_freep(&m->elems);
av_freep(pm); av_freep(pm);
} }
@ -128,7 +128,7 @@ int av_dict_set(AVDictionary **pm, const char *key, const char *value,
err_out: err_out:
if (m && !m->count) { if (m && !m->count) {
av_free(m->elems); av_freep(&m->elems);
av_freep(pm); av_freep(pm);
} }
if (flags & AV_DICT_DONT_STRDUP_KEY) av_free((void*)key); if (flags & AV_DICT_DONT_STRDUP_KEY) av_free((void*)key);
@ -197,10 +197,10 @@ void av_dict_free(AVDictionary **pm)
if (m) { if (m) {
while (m->count--) { while (m->count--) {
av_free(m->elems[m->count].key); av_freep(&m->elems[m->count].key);
av_free(m->elems[m->count].value); av_freep(&m->elems[m->count].value);
} }
av_free(m->elems); av_freep(&m->elems);
} }
av_freep(pm); av_freep(pm);
} }

Write Preview
Loading…
Cancel
Save