From 85e2b222e9105d6202a2ed843350065b5b37c81d Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Sat, 12 Oct 2019 00:36:19 +0800 Subject: [PATCH] lavfi/avf_showspectrum: add error handle if av_asprintf return null add error handle if av_asprintf return null. Signed-off-by: Jun Zhao --- libavfilter/avf_showspectrum.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libavfilter/avf_showspectrum.c b/libavfilter/avf_showspectrum.c index f175bf1cb5..d5785af252 100644 --- a/libavfilter/avf_showspectrum.c +++ b/libavfilter/avf_showspectrum.c @@ -695,11 +695,15 @@ static int draw_legend(AVFilterContext *ctx, int samples) inlink->channel_layout); text = av_asprintf("%d Hz | %s", inlink->sample_rate, chlayout_str); + if (!text) + return AVERROR(ENOMEM); drawtext(s->outpicref, 2, outlink->h - 10, "CREATED BY LIBAVFILTER", 0); drawtext(s->outpicref, outlink->w - 2 - strlen(text) * 10, outlink->h - 10, text, 0); if (s->stop) { char *text = av_asprintf("Zoom: %d Hz - %d Hz", s->start, s->stop); + if (!text) + return AVERROR(ENOMEM); drawtext(s->outpicref, outlink->w - 2 - strlen(text) * 10, 3, text, 0); av_freep(&text); } @@ -766,6 +770,8 @@ static int draw_legend(AVFilterContext *ctx, int samples) for (x = 0; x < s->w && s->single_pic; x+=80) { float seconds = x * spp / inlink->sample_rate; char *units = get_time(ctx, seconds, x); + if (!units) + return AVERROR(ENOMEM); drawtext(s->outpicref, s->start_x + x - 4 * strlen(units), s->h + s->start_y + 6, units, 0); drawtext(s->outpicref, s->start_x + x - 4 * strlen(units), s->start_y - 12, units, 0); @@ -822,6 +828,8 @@ static int draw_legend(AVFilterContext *ctx, int samples) for (y = 0; y < s->h && s->single_pic; y+=40) { float seconds = y * spp / inlink->sample_rate; char *units = get_time(ctx, seconds, x); + if (!units) + return AVERROR(ENOMEM); drawtext(s->outpicref, s->start_x - 8 * strlen(units) - 4, s->start_y + y - 4, units, 0); av_free(units); @@ -1360,6 +1368,8 @@ static int plot_spectrum_column(AVFilterLink *inlink, AVFrame *insamples) if (s->old_pts < outpicref->pts) { if (s->legend) { char *units = get_time(ctx, insamples->pts /(float)inlink->sample_rate, x); + if (!units) + return AVERROR(ENOMEM); if (s->orientation == VERTICAL) { for (y = 0; y < 10; y++) {