Commit b3c6e89d authored by Paul B Mahol's avatar Paul B Mahol

avfilter/avf_showspectrum: do not use uninitialized memory

parent 703ae350
...@@ -380,7 +380,7 @@ static int config_output(AVFilterLink *outlink) ...@@ -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) ...@@ -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];
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment