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

Merge commit 'c3bd1d60af97e8d2568dac9fcce7bdabb4ff93c8'

Browse Source 
* commit 'c3bd1d60af97e8d2568dac9fcce7bdabb4ff93c8':
  formats: Check memory allocations

Conflicts:
	libavfilter/formats.c

See: 527ca3985c736ffe077a82fdf3616f0fd571b923
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-03-12 22:39:27 +01:00
commit 9f8f2bcab6
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavfilter/formats.c
View File

@ -281,12 +281,13 @@ int ff_fmt_is_in(int fmt, const int *fmts)
for (count = 0; fmts[count] != -1; count++) \ for (count = 0; fmts[count] != -1; count++) \
; \ ; \
formats = av_mallocz(sizeof(*formats)); \ formats = av_mallocz(sizeof(*formats)); \
if (!formats) return NULL; \ if (!formats) \
return NULL; \
formats->count_field = count; \ formats->count_field = count; \
if (count) { \ if (count) { \
formats->field = av_malloc_array(count, sizeof(*formats->field)); \ formats->field = av_malloc_array(count, sizeof(*formats->field)); \
if (!formats->field) { \ if (!formats->field) { \
av_free(formats); \ av_freep(&formats); \
return NULL; \ return NULL; \
} \ } \
} }
@ -415,6 +416,8 @@ AVFilterChannelLayouts *ff_all_channel_counts(void)
do { \ do { \
*ref = f; \ *ref = f; \
f->refs = av_realloc(f->refs, sizeof(*f->refs) * ++f->refcount); \ f->refs = av_realloc(f->refs, sizeof(*f->refs) * ++f->refcount); \
if (!f->refs) \
return; \
f->refs[f->refcount-1] = ref; \ f->refs[f->refcount-1] = ref; \
} while (0) } while (0)