History

avfilter/vf_fftfilt: Check return value of av_tx_init()

Should fix Coverity issue #1516765.

Andreas Rheinhardt committed 4 years ago

Commit 36d05501 parent b6fcf3a1 file · +17 −13Browse files

Unified · Split

libavfilter/vf_fftfilt.c+17−13
@@ -306,7 +306,7 @@ static int config_props(AVFilterLink *inlink) · 305 unmodified lines
306306 {
307307 FFTFILTContext *s = inlink->dst->priv;
308308 const AVPixFmtDescriptor *desc;
309− int i, plane;
309+ int ret, i, plane;
310310
311311 desc = av_pix_fmt_desc_get(inlink->format);
312312 s->depth = desc->comp[0].depth;
@@ -335,12 +335,14 @@ static int config_props(AVFilterLink *inlink) · 22 unmodified lines
335335 for (int j = 0; j < s->nb_threads; j++) {
336336 float scale = 1.f, iscale = 1.f;
337337
338− av_tx_init(&s->hrdft[j][i], &s->htx_fn, AV_TX_FLOAT_RDFT, 0, 1 << s->rdft_hbits[i], &scale, 0);
339− if (!s->hrdft[j][i])
340− return AVERROR(ENOMEM);
341− av_tx_init(&s->ihrdft[j][i], &s->ihtx_fn, AV_TX_FLOAT_RDFT, 1, 1 << s->rdft_hbits[i], &iscale, 0);
342− if (!s->ihrdft[j][i])
343− return AVERROR(ENOMEM);
338+ ret = av_tx_init(&s->hrdft[j][i], &s->htx_fn, AV_TX_FLOAT_RDFT,
339+ 0, 1 << s->rdft_hbits[i], &scale, 0);
340+ if (ret < 0)
341+ return ret;
342+ ret = av_tx_init(&s->ihrdft[j][i], &s->ihtx_fn, AV_TX_FLOAT_RDFT,
343+ 1, 1 << s->rdft_hbits[i], &iscale, 0);
344+ if (ret < 0)
345+ return ret;
344346 }
345347
346348 /* RDFT - Array initialization for Vertical pass*/
@@ -356,12 +358,14 @@ static int config_props(AVFilterLink *inlink) · 9 unmodified lines
356358 for (int j = 0; j < s->nb_threads; j++) {
357359 float scale = 1.f, iscale = 1.f;
358360
359− av_tx_init(&s->vrdft[j][i], &s->vtx_fn, AV_TX_FLOAT_RDFT, 0, 1 << s->rdft_vbits[i], &scale, 0);
360− if (!s->vrdft[j][i])
361− return AVERROR(ENOMEM);
362− av_tx_init(&s->ivrdft[j][i], &s->ivtx_fn, AV_TX_FLOAT_RDFT, 1, 1 << s->rdft_vbits[i], &iscale, 0);
363− if (!s->ivrdft[j][i])
364− return AVERROR(ENOMEM);
361+ ret = av_tx_init(&s->vrdft[j][i], &s->vtx_fn, AV_TX_FLOAT_RDFT,
362+ 0, 1 << s->rdft_vbits[i], &scale, 0);
363+ if (ret < 0)
364+ return ret;
365+ ret = av_tx_init(&s->ivrdft[j][i], &s->ivtx_fn, AV_TX_FLOAT_RDFT,
366+ 1, 1 << s->rdft_vbits[i], &iscale, 0);
367+ if (ret < 0)
368+ return ret;
365369 }
366370 }
367371

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t