From patchwork Sat Dec 5 20:33:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24359 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 421EE448E0A for ; Sat, 5 Dec 2020 22:34:26 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2577C68A5F4; Sat, 5 Dec 2020 22:34:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8BD8D6882DE for ; Sat, 5 Dec 2020 22:34:19 +0200 (EET) Received: by mail-wr1-f49.google.com with SMTP id x6so4795331wro.11 for ; Sat, 05 Dec 2020 12:34:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4zLMNJdk+0NpAs8e3wiL3Fie/P6O0bT6WOtUFVBsAnA=; b=OiebqdJTIT91W2yp9YwupjyyRJZGEE35tzTw00qI4s7CCUXp95Mbq59Ers6mkFIFfC ZtQPsmIM419USmtrbjWR9iIHK4SO3GSVrwvET3w+02/jKkVE0aaBzyOd1FCey9nT7awT o1BpQBmQ2mGFucnDJu4evecRyGLpCr0f9M+ISzUWVCOV1wpT4iD1x7YgjJhlEYfoPVQT KPaII69jHTqHYo4osirZZMgR7H6WT6Fy6EoaxgX1Mt48R+Bk5AM5HujBEogGZKm1PGv+ GuUAebLuUWZadjbfUxv8l6LiZgI7SPo5nDkON/IW+sD6Iig7jnGOZylZNy+QQNwhkMm1 Rapg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4zLMNJdk+0NpAs8e3wiL3Fie/P6O0bT6WOtUFVBsAnA=; b=eO+kpFUOx7ugMA1aUIvvdRZG4W+WBUIviQwt53T/+zVI0p8SVD0UMmHNzdf9ux+Cyk N2FG2p/lOLaA8S8iTUV1TDVeT0ZeZ3A8YJFOlqmIhELF1XztmY4bIjJOErxWVHbgE0i6 Z+bJYYxNLbNGjDNDvlPQsfgWGP9pujaG7/de4cPMYhI1mQVAIg6eA+/7u8vjjFipSqxU HJgYeKyojRcOQYEtn5dK9v0H1ZWewGgJ3yRzr7mJNel7Hd7KKQ37RU/RHt+brBEu8D5P R0tdAKTpz/wNutQEnP7zekd2PgV1COGAFQhwdp1npUrTO/0BqJK5sZbJ+LBngJwFLMHM TS/g== X-Gm-Message-State: AOAM533otr1S7Vp03plyiIUisr36reUbaSiOL5HsEjCQ51unBplRHlTS FhkLC51Jvm0aVOW4mDngOZDnuQoDKAMFhw== X-Google-Smtp-Source: ABdhPJwLcr1m3TsK4kw7oYwOtqnh4sggLUssDw1ArKBdhHDrCgGd6YMuJvC2qTHWx05w+go/9Mi5eQ== X-Received: by 2002:adf:f5c8:: with SMTP id k8mr12047469wrp.2.1607200458652; Sat, 05 Dec 2020 12:34:18 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id e4sm8747079wrr.32.2020.12.05.12.34.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Dec 2020 12:34:18 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 5 Dec 2020 21:33:38 +0100 Message-Id: <20201205203340.19357-6-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201205203340.19357-1-andreas.rheinhardt@gmail.com> References: <20201205203340.19357-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 6/7] avcodec/ac3dec: Check operations that can fail X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavcodec/ac3dec.c | 11 +++++++---- libavcodec/ac3dec_fixed.c | 1 + libavcodec/ac3dec_float.c | 2 ++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index eaa327a3ee..3e4bec56b1 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -184,22 +184,25 @@ static av_cold void ac3_tables_init(void) static av_cold int ac3_decode_init(AVCodecContext *avctx) { AC3DecodeContext *s = avctx->priv_data; - int i; + int i, ret; s->avctx = avctx; ac3_tables_init(); - ff_mdct_init(&s->imdct_256, 8, 1, 1.0); - ff_mdct_init(&s->imdct_512, 9, 1, 1.0); + if ((ret = ff_mdct_init(&s->imdct_256, 8, 1, 1.0)) < 0 || + (ret = ff_mdct_init(&s->imdct_512, 9, 1, 1.0)) < 0) + return ret; AC3_RENAME(ff_kbd_window_init)(s->window, 5.0, 256); ff_bswapdsp_init(&s->bdsp); #if (USE_FIXED) s->fdsp = avpriv_alloc_fixed_dsp(avctx->flags & AV_CODEC_FLAG_BITEXACT); #else - s->fdsp = avpriv_float_dsp_alloc(avctx->flags & AV_CODEC_FLAG_BITEXACT); ff_fmt_convert_init(&s->fmt_conv, avctx); + s->fdsp = avpriv_float_dsp_alloc(avctx->flags & AV_CODEC_FLAG_BITEXACT); #endif + if (!s->fdsp) + return AVERROR(ENOMEM); ff_ac3dsp_init(&s->ac3dsp, avctx->flags & AV_CODEC_FLAG_BITEXACT); av_lfg_init(&s->dith_state, 0); diff --git a/libavcodec/ac3dec_fixed.c b/libavcodec/ac3dec_fixed.c index f36854cdc5..662cb8169e 100644 --- a/libavcodec/ac3dec_fixed.c +++ b/libavcodec/ac3dec_fixed.c @@ -182,4 +182,5 @@ AVCodec ff_ac3_fixed_decoder = { .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_NONE }, .priv_class = &ac3_decoder_class, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/ac3dec_float.c b/libavcodec/ac3dec_float.c index 57a626a181..5010ee0ca5 100644 --- a/libavcodec/ac3dec_float.c +++ b/libavcodec/ac3dec_float.c @@ -67,6 +67,7 @@ AVCodec ff_ac3_decoder = { .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, .priv_class = &ac3_decoder_class, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; #if CONFIG_EAC3_DECODER @@ -91,5 +92,6 @@ AVCodec ff_eac3_decoder = { .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, .priv_class = &eac3_decoder_class, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; #endif