generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

formats: Check memory allocations

Browse Source
This commit is contained in:
Vittorio Giovara 2015-03-12 15:34:32 +00:00
parent 5a2645cafe
commit c3bd1d60af
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavfilter/formats.c
View File

@ -171,8 +171,15 @@ AVFilterFormats *ff_make_format_list(const int *fmts)
; ;
formats = av_mallocz(sizeof(*formats)); formats = av_mallocz(sizeof(*formats));
if (count) if (!formats)
return NULL;
if (count) {
formats->formats = av_malloc(sizeof(*formats->formats) * count); formats->formats = av_malloc(sizeof(*formats->formats) * count);
if (!formats->formats) {
av_freep(&formats);
return NULL;
}
}
formats->nb_formats = count; formats->nb_formats = count;
memcpy(formats->formats, fmts, sizeof(*formats->formats) * count); memcpy(formats->formats, fmts, sizeof(*formats->formats) * count);
@ -257,6 +264,8 @@ AVFilterChannelLayouts *ff_all_channel_layouts(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)