# HG changeset patch # User mru # Date 1278691552 0 # Node ID a80468e73475c53d7a5d9b9c2d2025de35498d35 # Parent 4530b6b4d93103310c1e53bcc0bd01eb0fc27e5d resample: check memory allocations in av_resample_init() diff -r 4530b6b4d931 -r a80468e73475 resample2.c --- a/resample2.c Fri Jul 09 10:53:36 2010 +0000 +++ b/resample2.c Fri Jul 09 16:05:52 2010 +0000 @@ -183,12 +183,17 @@ double factor= FFMIN(out_rate * cutoff / in_rate, 1.0); int phase_count= 1<phase_shift= phase_shift; c->phase_mask= phase_count-1; c->linear= linear; c->filter_length= FFMAX((int)ceil(filter_size/factor), 1); c->filter_bank= av_mallocz(c->filter_length*(phase_count+1)*sizeof(FELEM)); + if (!c->filter_bank) + goto error; build_filter(c->filter_bank, factor, c->filter_length, phase_count, 1<filter_bank[c->filter_length*phase_count+1], c->filter_bank, (c->filter_length-1)*sizeof(FELEM)); c->filter_bank[c->filter_length*phase_count]= c->filter_bank[c->filter_length - 1]; @@ -198,6 +203,9 @@ c->index= -phase_count*((c->filter_length-1)/2); return c; +error: + av_free(c); + return NULL; } void av_resample_close(AVResampleContext *c){