From 5f8de423f190bbb79a62f804151bc24824fa32d8 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Fri, 2 Feb 2018 04:16:08 -0500 Subject: Add m-esr52 at 52.6.0 --- media/libspeex_resampler/handle-memory-error.patch | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 media/libspeex_resampler/handle-memory-error.patch (limited to 'media/libspeex_resampler/handle-memory-error.patch') diff --git a/media/libspeex_resampler/handle-memory-error.patch b/media/libspeex_resampler/handle-memory-error.patch new file mode 100644 index 000000000..f712a2de6 --- /dev/null +++ b/media/libspeex_resampler/handle-memory-error.patch @@ -0,0 +1,46 @@ +diff --git a/media/libspeex_resampler/src/resample.c b/media/libspeex_resampler/src/resample.c +index 83ad119..a3859e3 100644 +--- a/media/libspeex_resampler/src/resample.c ++++ b/media/libspeex_resampler/src/resample.c +@@ -811,6 +811,12 @@ EXPORT SpeexResamplerState *speex_resampler_init_frac(spx_uint32_t nb_channels, + return NULL; + } + st = (SpeexResamplerState *)speex_alloc(sizeof(SpeexResamplerState)); ++ if (!st) ++ { ++ if (err) ++ *err = RESAMPLER_ERR_ALLOC_FAILED; ++ return NULL; ++ } + st->initialised = 0; + st->started = 0; + st->in_rate = 0; +@@ -832,9 +838,12 @@ EXPORT SpeexResamplerState *speex_resampler_init_frac(spx_uint32_t nb_channels, + st->buffer_size = 160; + + /* Per channel data */ +- st->last_sample = (spx_int32_t*)speex_alloc(nb_channels*sizeof(spx_int32_t)); +- st->magic_samples = (spx_uint32_t*)speex_alloc(nb_channels*sizeof(spx_uint32_t)); +- st->samp_frac_num = (spx_uint32_t*)speex_alloc(nb_channels*sizeof(spx_uint32_t)); ++ if (!(st->last_sample = (spx_int32_t*)speex_alloc(nb_channels*sizeof(spx_int32_t)))) ++ goto fail; ++ if (!(st->magic_samples = (spx_uint32_t*)speex_alloc(nb_channels*sizeof(spx_uint32_t)))) ++ goto fail; ++ if (!(st->samp_frac_num = (spx_uint32_t*)speex_alloc(nb_channels*sizeof(spx_uint32_t)))) ++ goto fail; + for (i=0;ilast_sample[i] = 0; +@@ -857,6 +866,12 @@ EXPORT SpeexResamplerState *speex_resampler_init_frac(spx_uint32_t nb_channels, + *err = filter_err; + + return st; ++ ++fail: ++ if (err) ++ *err = RESAMPLER_ERR_ALLOC_FAILED; ++ speex_resampler_destroy(st); ++ return NULL; + } + + EXPORT void speex_resampler_destroy(SpeexResamplerState *st) -- cgit v1.2.3