Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

ffplay: Switch to show waves mode if allocation/init of RDFT fails

Browse source 
Fixes null pointer dereference

Found-by: Paweł <pantrombka@gmail.com>
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-03-02 14:19:41 +01:00
parent f6f1e2b3be
commit 7da7d269b8
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ffplay.c
View file

@ -1247,7 +1247,10 @@ static void video_audio_display(VideoState *s)
s->rdft_bits = rdft_bits; s->rdft_bits = rdft_bits;
s->rdft_data = av_malloc_array(nb_freq, 4 *sizeof(*s->rdft_data)); s->rdft_data = av_malloc_array(nb_freq, 4 *sizeof(*s->rdft_data));
} }
{ if (!s->rdft || !s->rdft_data){
av_log(NULL, AV_LOG_ERROR, "Failed to allocate buffers for RDFT, switching to waves display\n");
s->show_mode = SHOW_MODE_WAVES;
} else {
FFTSample *data[2]; FFTSample *data[2];
for (ch = 0; ch < nb_display_channels; ch++) { for (ch = 0; ch < nb_display_channels; ch++) {
data[ch] = s->rdft_data + 2 * nb_freq * ch; data[ch] = s->rdft_data + 2 * nb_freq * ch;