[FFmpeg-cvslog] ffplay: check av_samples_get_buffer_size() return

Michael Niedermayer git at videolan.org
Sun Apr 21 19:41:33 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Apr 21 15:55:04 2013 +0200| [047716bbd8f5ffad3fed160edeb8ad1e9d24a936] | committer: Michael Niedermayer

ffplay: check av_samples_get_buffer_size() return

Fixes CID1005310
Reviewed-by: Marton Balint <cus at passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 ffplay.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ffplay.c b/ffplay.c
index e2014be..ca0a828 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -2262,6 +2262,10 @@ static int audio_decode_frame(VideoState *is)
                 int out_count = (int64_t)wanted_nb_samples * is->audio_tgt.freq / is->frame->sample_rate + 256;
                 int out_size  = av_samples_get_buffer_size(NULL, is->audio_tgt.channels, out_count, is->audio_tgt.fmt, 0);
                 int len2;
+                if (out_size < 0) {
+                    fprintf(stderr, "av_samples_get_buffer_size() failed\n");
+                    break;
+                }
                 if (wanted_nb_samples != is->frame->nb_samples) {
                     if (swr_set_compensation(is->swr_ctx, (wanted_nb_samples - is->frame->nb_samples) * is->audio_tgt.freq / is->frame->sample_rate,
                                                 wanted_nb_samples * is->audio_tgt.freq / is->frame->sample_rate) < 0) {



More information about the ffmpeg-cvslog mailing list