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

avfilter: don't abort() on zero-size allocations.

Browse Source
This commit is contained in:
Ronald S. Bultje
2011-10-29 16:17:27 -07:00
parent ea2bb12e3e
commit 23a8b4ddfc
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavfilter/formats.c
View File

@@ -43,19 +43,21 @@ static void merge_ref(AVFilterFormats *ret, AVFilterFormats *a)
AVFilterFormats *avfilter_merge_formats(AVFilterFormats *a, AVFilterFormats *b) AVFilterFormats *avfilter_merge_formats(AVFilterFormats *a, AVFilterFormats *b)
{ {
AVFilterFormats *ret; AVFilterFormats *ret;
unsigned i, j, k = 0; unsigned i, j, k = 0, m_count;
ret = av_mallocz(sizeof(AVFilterFormats)); ret = av_mallocz(sizeof(AVFilterFormats));
/* merge list of formats */ /* merge list of formats */
ret->formats = av_malloc(sizeof(*ret->formats) * FFMIN(a->format_count, m_count = FFMIN(a->format_count, b->format_count);
b->format_count)); if (m_count) {
ret->formats = av_malloc(sizeof(*ret->formats) * m_count);
for(i = 0; i < a->format_count; i ++) for(i = 0; i < a->format_count; i ++)
for(j = 0; j < b->format_count; j ++) for(j = 0; j < b->format_count; j ++)
if(a->formats[i] == b->formats[j]) if(a->formats[i] == b->formats[j])
ret->formats[k++] = a->formats[i]; ret->formats[k++] = a->formats[i];
ret->format_count = k; ret->format_count = k;
}
/* check that there was at least one common format */ /* check that there was at least one common format */
if(!ret->format_count) { if(!ret->format_count) {
av_free(ret->formats); av_free(ret->formats);
@@ -91,6 +93,7 @@ AVFilterFormats *avfilter_make_format_list(const int *fmts)
; ;
formats = av_mallocz(sizeof(AVFilterFormats)); formats = av_mallocz(sizeof(AVFilterFormats));
if (count)
formats->formats = av_malloc(sizeof(*formats->formats) * count); formats->formats = av_malloc(sizeof(*formats->formats) * count);
formats->format_count = count; formats->format_count = count;
memcpy(formats->formats, fmts, sizeof(*formats->formats) * count); memcpy(formats->formats, fmts, sizeof(*formats->formats) * count);