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

avfilter/formats: proper error handling in ff_channel_layouts_ref() and ff_formats_ref()

Browse Source 
Also make sure the allocation and its check are properly done.
This commit is contained in:
Clément Bœsch
2015-03-14 21:21:49 +01:00
parent 93d9ce7cec
commit f861d9b2c6
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libavfilter/formats.c
View File

@@ -400,21 +400,21 @@ AVFilterChannelLayouts *ff_all_channel_counts(void)
return ret; return ret;
} }
#define FORMATS_REF(f, ref) \ #define FORMATS_REF(f, ref) \
do { \ void *tmp = av_realloc_array(f->refs, sizeof(*f->refs), f->refcount + 1); \
*ref = f; \ if (!tmp) \
f->refs = av_realloc(f->refs, sizeof(*f->refs) * ++f->refcount); \ return AVERROR(ENOMEM); \
if (!f->refs) \ f->refs = tmp; \
return; \ f->refs[f->refcount++] = ref; \
f->refs[f->refcount-1] = ref; \ *ref = f; \
} while (0) return 0
void ff_channel_layouts_ref(AVFilterChannelLayouts *f, AVFilterChannelLayouts **ref) int ff_channel_layouts_ref(AVFilterChannelLayouts *f, AVFilterChannelLayouts **ref)
{ {
FORMATS_REF(f, ref); FORMATS_REF(f, ref);
} }
void ff_formats_ref(AVFilterFormats *f, AVFilterFormats **ref) int ff_formats_ref(AVFilterFormats *f, AVFilterFormats **ref)
{ {
FORMATS_REF(f, ref); FORMATS_REF(f, ref);
} }

6
libavfilter/formats.h
View File

@@ -159,8 +159,8 @@ int ff_add_channel_layout(AVFilterChannelLayouts **l, uint64_t channel_layout);
/** /**
* Add *ref as a new reference to f. * Add *ref as a new reference to f.
*/ */
void ff_channel_layouts_ref(AVFilterChannelLayouts *f, int ff_channel_layouts_ref(AVFilterChannelLayouts *f,
AVFilterChannelLayouts **ref); AVFilterChannelLayouts **ref);
/** /**
* Remove a reference to a channel layouts list. * Remove a reference to a channel layouts list.
@@ -233,7 +233,7 @@ AVFilterFormats *ff_merge_formats(AVFilterFormats *a, AVFilterFormats *b,
* | |____| | | |____| * | |____| | | |____|
* |________| |________________________ * |________| |________________________
*/ */
void ff_formats_ref(AVFilterFormats *formats, AVFilterFormats **ref); int ff_formats_ref(AVFilterFormats *formats, AVFilterFormats **ref);
/** /**
* If *ref is non-NULL, remove *ref as a reference to the format list * If *ref is non-NULL, remove *ref as a reference to the format list