virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

avfilter/avf_showspectrum: do not use uninitialized memory

Browse Source
This commit is contained in:
Paul B Mahol 2016-08-18 18:40:00 +02:00
parent 703ae350c2
commit b3c6e89d48
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavfilter/avf_showspectrum.c
View File

@ -380,7 +380,7 @@ static int config_output(AVFilterLink *outlink)
if (!s->color_buffer) if (!s->color_buffer)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
for (i = 0; i < s->nb_display_channels; i++) { for (i = 0; i < s->nb_display_channels; i++) {
s->color_buffer[i] = av_malloc_array(s->orientation == VERTICAL ? s->h * 3 : s->w * 3, sizeof(**s->color_buffer)); s->color_buffer[i] = av_calloc(s->orientation == VERTICAL ? s->h * 3 : s->w * 3, sizeof(**s->color_buffer));
if (!s->color_buffer[i]) if (!s->color_buffer[i])
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
@ -730,8 +730,7 @@ static int plot_spectrum_column(AVFilterLink *inlink, AVFrame *insamples)
ctx->internal->execute(ctx, plot_channel, NULL, NULL, s->nb_display_channels); ctx->internal->execute(ctx, plot_channel, NULL, NULL, s->nb_display_channels);
for (y = 0; y < z * 3; y++) { for (y = 0; y < z * 3; y++) {
s->combine_buffer[y] += s->color_buffer[0][y]; for (x = 0; x < s->nb_display_channels; x++) {
for (x = 1; x < s->nb_display_channels; x++) {
s->combine_buffer[y] += s->color_buffer[x][y]; s->combine_buffer[y] += s->color_buffer[x][y];
} }
} }