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

Add memory allocation failure checks to ff_iir_filter_init_coeffs().

Browse Source 
Signed-off-by: Mans Rullgard <mans@mansr.com>
This commit is contained in:
Justin Ruggles 2011-01-20 18:28:16 +00:00 committed by Mans Rullgard
parent f0f54c297f
commit d42dc217ed
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/iirfilter.c
View File

@ -47,7 +47,8 @@ typedef struct FFIIRFilterState{
/// maximum supported filter order /// maximum supported filter order
#define MAXORDER 30 #define MAXORDER 30
av_cold struct FFIIRFilterCoeffs* ff_iir_filter_init_coeffs(enum IIRFilterType filt_type, av_cold struct FFIIRFilterCoeffs* ff_iir_filter_init_coeffs(void *avc,
enum IIRFilterType filt_type,
enum IIRFilterMode filt_mode, enum IIRFilterMode filt_mode,
int order, float cutoff_ratio, int order, float cutoff_ratio,
float stopband, float ripple) float stopband, float ripple)
@ -62,9 +63,12 @@ av_cold struct FFIIRFilterCoeffs* ff_iir_filter_init_coeffs(enum IIRFilterType f
if(order <= 1 || (order & 1) || order > MAXORDER || cutoff_ratio >= 1.0) if(order <= 1 || (order & 1) || order > MAXORDER || cutoff_ratio >= 1.0)
return NULL; return NULL;
c = av_malloc(sizeof(FFIIRFilterCoeffs)); FF_ALLOCZ_OR_GOTO(avc, c, sizeof(FFIIRFilterCoeffs),
c->cx = av_malloc(sizeof(c->cx[0]) * ((order >> 1) + 1)); init_fail);
c->cy = av_malloc(sizeof(c->cy[0]) * order); FF_ALLOC_OR_GOTO (avc, c->cx, sizeof(c->cx[0]) * ((order >> 1) + 1),
init_fail);
FF_ALLOC_OR_GOTO (avc, c->cy, sizeof(c->cy[0]) * order,
init_fail);
c->order = order; c->order = order;
wa = 2 * tan(M_PI * 0.5 * cutoff_ratio); wa = 2 * tan(M_PI * 0.5 * cutoff_ratio);
@ -110,6 +114,10 @@ av_cold struct FFIIRFilterCoeffs* ff_iir_filter_init_coeffs(enum IIRFilterType f
c->gain /= 1 << order; c->gain /= 1 << order;
return c; return c;
init_fail:
ff_iir_filter_free_coeffs(c);
return NULL;
} }
av_cold struct FFIIRFilterState* ff_iir_filter_init_state(int order) av_cold struct FFIIRFilterState* ff_iir_filter_init_state(int order)

5
libavcodec/iirfilter.h
View File

@ -49,6 +49,8 @@ enum IIRFilterMode{
/** /**
* Initialize filter coefficients. * Initialize filter coefficients.
* *
* @param avc a pointer to an arbitrary struct of which the first
* field is a pointer to an AVClass struct
* @param filt_type filter type (e.g. Butterworth) * @param filt_type filter type (e.g. Butterworth)
* @param filt_mode filter mode (e.g. lowpass) * @param filt_mode filter mode (e.g. lowpass)
* @param order filter order * @param order filter order
@ -58,7 +60,8 @@ enum IIRFilterMode{
* *
* @return pointer to filter coefficients structure or NULL if filter cannot be created * @return pointer to filter coefficients structure or NULL if filter cannot be created
*/ */
struct FFIIRFilterCoeffs* ff_iir_filter_init_coeffs(enum IIRFilterType filt_type, struct FFIIRFilterCoeffs* ff_iir_filter_init_coeffs(void *avc,
enum IIRFilterType filt_type,
enum IIRFilterMode filt_mode, enum IIRFilterMode filt_mode,
int order, float cutoff_ratio, int order, float cutoff_ratio,
float stopband, float ripple); float stopband, float ripple);

2
libavcodec/psymodel.c
View File

@ -88,7 +88,7 @@ av_cold struct FFPsyPreprocessContext* ff_psy_preprocess_init(AVCodecContext *av
cutoff_coeff = 2.0 * avctx->cutoff / avctx->sample_rate; cutoff_coeff = 2.0 * avctx->cutoff / avctx->sample_rate;
if (cutoff_coeff) if (cutoff_coeff)
ctx->fcoeffs = ff_iir_filter_init_coeffs(FF_FILTER_TYPE_BUTTERWORTH, FF_FILTER_MODE_LOWPASS, ctx->fcoeffs = ff_iir_filter_init_coeffs(avctx, FF_FILTER_TYPE_BUTTERWORTH, FF_FILTER_MODE_LOWPASS,
FILT_ORDER, cutoff_coeff, 0.0, 0.0); FILT_ORDER, cutoff_coeff, 0.0, 0.0);
if (ctx->fcoeffs) { if (ctx->fcoeffs) {
ctx->fstate = av_mallocz(sizeof(ctx->fstate[0]) * avctx->channels); ctx->fstate = av_mallocz(sizeof(ctx->fstate[0]) * avctx->channels);