[FFmpeg-cvslog] swresample/dither: check memory allocation

[Ganesh Ajjanagadde]

ffmpeg | branch: release/2.2 | Ganesh Ajjanagadde <gajjanagadde at gmail.com> | Tue Jun  2 23:17:48 2015 -0400| [0fee46e2dbc0a07f3abb0bca7d2c76d6c88868d7] | committer: Michael Niedermayer

swresample/dither: check memory allocation

check memory allocation in swri_get_dither()

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 196b885a5f0aa3ca022c1fa99509f47341239784)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0fee46e2dbc0a07f3abb0bca7d2c76d6c88868d7
---

 libswresample/dither.c              |    6 +++++-
 libswresample/swresample.c          |    3 ++-
 libswresample/swresample_internal.h |    2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/libswresample/dither.c b/libswresample/dither.c
index 8121f11..23e7e12 100644
--- a/libswresample/dither.c
+++ b/libswresample/dither.c
@@ -23,12 +23,15 @@
 
 #include "noise_shaping_data.c"
 
-void swri_get_dither(SwrContext *s, void *dst, int len, unsigned seed, enum AVSampleFormat noise_fmt) {
+int swri_get_dither(SwrContext *s, void *dst, int len, unsigned seed, enum AVSampleFormat noise_fmt) {
     double scale = s->dither.noise_scale;
 #define TMP_EXTRA 2
     double *tmp = av_malloc_array(len + TMP_EXTRA, sizeof(double));
     int i;
 
+    if (!tmp)
+        return AVERROR(ENOMEM);
+
     for(i=0; i<len + TMP_EXTRA; i++){
         double v;
         seed = seed* 1664525 + 1013904223;
@@ -70,6 +73,7 @@ void swri_get_dither(SwrContext *s, void *dst, int len, unsigned seed, enum AVSa
     }
 
     av_free(tmp);
+    return 0;
 }
 
 int swri_dither_init(SwrContext *s, enum AVSampleFormat out_fmt, enum AVSampleFormat in_fmt)
diff --git a/libswresample/swresample.c b/libswresample/swresample.c
index 9cd4e5d..5b9dc7c 100644
--- a/libswresample/swresample.c
+++ b/libswresample/swresample.c
@@ -704,7 +704,8 @@ static int swr_convert_internal(struct SwrContext *s, AudioData *out, int out_co
                 return ret;
             if(ret)
                 for(ch=0; ch<s->dither.noise.ch_count; ch++)
-                    swri_get_dither(s, s->dither.noise.ch[ch], s->dither.noise.count, 12345678913579<<ch, s->dither.noise.fmt);
+                    if((ret=swri_get_dither(s, s->dither.noise.ch[ch], s->dither.noise.count, 12345678913579<<ch, s->dither.noise.fmt))<0)
+                        return ret;
             av_assert0(s->dither.noise.ch_count == preout->ch_count);
 
             if(s->dither.noise_pos + out_count > s->dither.noise.count)
diff --git a/libswresample/swresample_internal.h b/libswresample/swresample_internal.h
index ab19f21..4de6017 100644
--- a/libswresample/swresample_internal.h
+++ b/libswresample/swresample_internal.h
@@ -185,7 +185,7 @@ void swri_rematrix_free(SwrContext *s);
 int swri_rematrix(SwrContext *s, AudioData *out, AudioData *in, int len, int mustcopy);
 void swri_rematrix_init_x86(struct SwrContext *s);
 
-void swri_get_dither(SwrContext *s, void *dst, int len, unsigned seed, enum AVSampleFormat noise_fmt);
+int swri_get_dither(SwrContext *s, void *dst, int len, unsigned seed, enum AVSampleFormat noise_fmt);
 int swri_dither_init(SwrContext *s, enum AVSampleFormat out_fmt, enum AVSampleFormat in_fmt);
 
 void swri_audio_convert_init_arm(struct AudioConvert *ac,