From patchwork Sat Feb 12 06:41:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34255 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:14aa:0:0:0:0 with SMTP id bz10csp3856147nkb; Fri, 11 Feb 2022 22:44:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJyVwV2XrrMwwuXZN6s2xZmVmeDVI/2HEW1HrSC4RhXRyYh+eoq7ScRqX5MA9Meg3/qcFfBV X-Received: by 2002:a17:907:1c81:: with SMTP id nb1mr4124181ejc.275.1644648241782; Fri, 11 Feb 2022 22:44:01 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id eq24si1946766edb.318.2022.02.11.22.44.01; Fri, 11 Feb 2022 22:44:01 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b="D0/3/M8J"; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 97B1868B284; Sat, 12 Feb 2022 08:42:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074029.outbound.protection.outlook.com [40.92.74.29]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6DC0C68B2A4 for ; Sat, 12 Feb 2022 08:42:01 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=S1yI5D7EByEeSh4STzjo08/b1ruMVzcU6xvq92Vznx31DkBupFOW6Ev+xpxhFbC2aONdn9HEa0lC8kfHwPyFap+7rINzTKZKNUBNS301Glh42+/pELqIsxGisA11knOSBwqGtLZ4H+IKRWPzq06raWbI2M06eb+5hKgDhsIDycNMXH/mas8jSP//+n0Lbktznt9G8bFaesOBN/C7hJupMPhXn9DzBu/8wEeka4BXwYRhomDemf0Eso2haJJk5AfzaGjcbnxar509jGhgNQh0IoL2D6XmPys7AP3mwM4Fu8CDil9dTCiAw6LOkbeiGJZs6HxMivula4Z6sxdVQovk9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ZUPkbXViDDTTXKRbjT3C9p7eqBj1ev+6kULIv8STG4w=; b=gSdkUPUwmNwGehr+IIxeGrSuzG6D7rX6ZBrJNNb3k1R5Gcj8Ut4NYxJ3QqnL2vedFvIrMUjKlImGI+mzoVm9q2oT8eFLTf7Q2RMhp22bD7FJnGIDm2VoH4FVFEhwndPttv9AJKtz1LGCpLCQTX49cvb0iI8V4sFT6YPacUSgMESXUI/7rvN7a+Knxhl9F4Y9rlo78kBlu9vwbHH1nUfevpLcmo/OsLI47Jw3wwgttKnsApGOntWMmsKyxa8jVZl49DaazLfQNj5FMHe1ueO+w7kvvETZlS91KIbAKRL78TA+jbok9FEx83j6h8jR3xg0DJXO5HziKq/xhKAhY/liJw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZUPkbXViDDTTXKRbjT3C9p7eqBj1ev+6kULIv8STG4w=; b=D0/3/M8J0q5zVvs7L/5VMh4ZiLhOYOX5UcSAf0SArsxbyhbALoUWynIbMfIOqeV7cnbuI5b9OyJhTstBaK0BfTeMUoXlzrp4Ov1UV0HBkyFKL5CEPhzbZb+sL8s/nuxAUNGRYZvssbs8rx+lFGpkQrJ+cNcz64zHZ6oRc2NCx//nSWZTKGIxTWg+rUxb1vRcMKYx1f3Mq7k18RjcvfbO5d+NTnUQjvtooLOxZNva65Iv/lMVb4TVZusiOVHaJic6ozQFOpIfilisbeWnNZwqS63j85hMS2yWbTR/w4FBciVBcUeRHENBpzKbtxau5aTqc4Ln3JTqrE1adTkZN7qwvg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM9PR03MB6723.eurprd03.prod.outlook.com (2603:10a6:20b:2d8::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.11; Sat, 12 Feb 2022 06:41:48 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%5]) with mapi id 15.20.4975.011; Sat, 12 Feb 2022 06:41:48 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 12 Feb 2022 07:41:21 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [s2AwAKC09ssDNQyOYJWCy+4AIeZRhP2c] X-ClientProxiedBy: AM7PR03CA0008.eurprd03.prod.outlook.com (2603:10a6:20b:130::18) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220212064131.2265452-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6776f645-faca-48a0-4c44-08d9edf2be7d X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UJsdM8Yzk49XyLWh7Bm6qMbAgjLStt1DU0yH3GJw/yY1K17y5MEE5wxF7laNhkjJuT3FCRnEAjNg3sBOGKs/jquEHlWG2urUKZy2ArXLYBv/LczRuyaWevyy5tcNFwJkWTFcTxJ2ADPwZjkXKI19mvu0aMNuyJ8t8HyO6sODNYQfU72HcswlCTJNTH39ERrqolkFYwnXTosQC3zvoZ9smnt80SNEgeaQJPlnNzyxWXWRIFB4NnM7Dfm9qLgwBS4cVeAn7V5gDTD6dsoCBACA83XLf1syighvrykPEoT77Lj6qOic7tLsm/GU66/V39dPEYW7Y8Zw1WrOEfzkQNyq0/Ls2Al4WHq3LxXw7aiUmabB6AonSniPxQHmuBzHJVWlr0lvFFCnkw1cQWFuITR/mZ6bh6J9SBZkbnRFkh7NqUQvQQXdPZ3oTFcsLOCOH66fnJNpgCJM3HWYMibhV1LWVQMi13p+FnFdti18Dd1X675F6has7spaevh4bT0Lk/tq6OlTzRb48Uus9TZlnVJsHC6H4x4+XgEJdH1NLFolIO7xyj5xNSNP8YM4OIgY8QuN4aY0fvhL/geFT83vsyUDp5yHC0aNnV+m/4MO5zcBrYigk4vQ3180CHpQepuKT6u0pUqqt3gxDJrjgY8DDO6pHWtv+y8h4G3wMpRjsFjAbI1s/3ukEZkQQSwAA3sXN8R7svEB95uQGGP/g== X-MS-TrafficTypeDiagnostic: AM9PR03MB6723:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LdYSWYvJbdi7PzOvXtMNkp5+w96zfjxuORcrs606KKD2c9javbeVYPvPcItbBP76Bo5R2peqZhzulzQ70h4zLg1SIBthnedFYXNGG5j2Tqh4nh/gXeWkgEbt9IrtzEn3w5KjsE9WwEmn/+Vpj6Y/wzKswjcIK+xzbd7SSj9+2OOgbKNFDfMRbsz9fGQRP3YmHPyF0KyKKbyTEtP5f46uEpZIr38e2v7rCnOTgyrg+VBFncekPNJjShLbITZuTW53dXKKAcRJiWVgH9cwZpTo+AJRpubmboovBtQkYQaeWRmtCZW3JMXSku2NrUBjp658Vy9UpOhC/lGdNnmutwXqPu/u6OR1in7IJlzhrooaNIzc6NURj6qo/vPpV0bmhBrI4l5tq6nRywC8H3UpK1wkhza9k3dilebJcZvyLPE9rTK9nrVFKSVfH7+uvuz03H0IwxGbOBSNfNLIl/Y3pjbOV3BaHbIB8Rk8DAFOQb+C4V87zK+wlbrqZLq3MPajs88Rf1WMcpo89mVbeIlOlMJyQAFXP4BGmszHEZ9K6Kclya1x9KKRaBXEiZPLuAEas1ph5DSOgMRV0b3Y2v5IplUJ9g== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rcvGHtVXcotd1O0hv8SnYQeHKUuYBl6z0IkmnrNkF9SaelIXWc3NZl7F7YBsxcIhpqs/Ee5r/bUTddmZMP0LyzaqA4826cpUSqc/gz0rn66K1UUXMANZiwiSp8H3XPp+M4htjy89/V08DsTcVglK3wGyU5I14WuRzdISlgeW9iqH7wYBrwGC60SgJQlsJhiKI/vHkBO5rKIsPnTfn2zduKhejad3mwC3cWj8qM2Xayx3oL14NWwGK/a2dVU85/fOYa0s9IsdUUAeeBsempewICFbEK7lIl3sHj7/pxlUUUsN5+OPOCUvcjEM72YjRCLMvOLxpeFq0zPxmxKm4WrN9lNR/bUnsokQUh6icA9DoANPhF5PN7sQwEYpOFhwA8q+TJAgSysBP9QCBnrNS6IHF/xrOwYgzN1uuoPK5PDevI7Bfa1oyw5L/72JG6qP1aGRA5RdB3hsF2Mo6lrHhalNA/0GuPfuE9rLjb68afB5+CZsFwe0W0hCROyXY1auRRfp6sjgz1CE2UHsTsWkAV/+dRNM09RriVwopaR6IQ+o9ARMbYDtdhF93xJq99B1lUG3UsLcK7RhxBlg8eKc2UUry4s4jtKnfL8deSjbthSYztFpdTsiLO84++FraP98UFPGhmHvYvU9kdDiwr94WelX8lD/LjmgiDHEvVon1CYnavNTq34J+FBJKl03cGkL/QT5ENoYq/UmTAG3KDsan1G0YSWsQ3I/KFay0fDBUme0nRJrCQnBisunHnmE4s5Diok5hoI7S8KdNoQ0pmnD8MVBr4X4ezKgpTd3KPphutPyDOanAVbAsTWU46UFmsfPFj0asiZ6smjVOu/Py8G+pK/noRkyUrzKIPVBfr2QzioZ3LMrQTg8oRxWkz/e9UEEWtpjyoSAlq5o2ofaDo0vKumEc4mHUrlaMKbtTk/TO2SodYn5XA6Qi1ldyYqhtYv5/rd5G7f1efnliD/TSHGALrkM1Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6776f645-faca-48a0-4c44-08d9edf2be7d X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Feb 2022 06:41:48.4949 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR03MB6723 Subject: [FFmpeg-devel] [PATCH 07/17] avcodec/alsdec: Return directly upon error X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: DoJNylFevBEI Signed-off-by: Andreas Rheinhardt --- libavcodec/alsdec.c | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c index 9e1aaf065a..f8609e61fd 100644 --- a/libavcodec/alsdec.c +++ b/libavcodec/alsdec.c @@ -1990,17 +1990,17 @@ static av_cold int decode_init(AVCodecContext *avctx) if ((ret = read_specific_config(ctx)) < 0) { av_log(avctx, AV_LOG_ERROR, "Reading ALSSpecificConfig failed.\n"); - goto fail; + return ret; } if ((ret = check_specific_config(ctx)) < 0) { - goto fail; + return ret; } if (sconf->bgmc) { ret = ff_bgmc_init(avctx, &ctx->bgmc_lut, &ctx->bgmc_lut_status); if (ret < 0) - goto fail; + return ret; } if (sconf->floating) { avctx->sample_fmt = AV_SAMPLE_FMT_FLT; @@ -2012,8 +2012,7 @@ static av_cold int decode_init(AVCodecContext *avctx) if (avctx->bits_per_raw_sample > 32) { av_log(avctx, AV_LOG_ERROR, "Bits per raw sample %d larger than 32.\n", avctx->bits_per_raw_sample); - ret = AVERROR_INVALIDDATA; - goto fail; + return AVERROR_INVALIDDATA; } } @@ -2044,8 +2043,7 @@ static av_cold int decode_init(AVCodecContext *avctx) !ctx->quant_cof_buffer || !ctx->lpc_cof_buffer || !ctx->lpc_cof_reversed_buffer) { av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n"); - ret = AVERROR(ENOMEM); - goto fail; + return AVERROR(ENOMEM); } // assign quantized parcor coefficient buffers @@ -2069,8 +2067,7 @@ static av_cold int decode_init(AVCodecContext *avctx) !ctx->use_ltp || !ctx->ltp_lag || !ctx->ltp_gain || !ctx->ltp_gain_buffer) { av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n"); - ret = AVERROR(ENOMEM); - goto fail; + return AVERROR(ENOMEM); } for (c = 0; c < num_buffers; c++) @@ -2086,8 +2083,7 @@ static av_cold int decode_init(AVCodecContext *avctx) if (!ctx->chan_data_buffer || !ctx->chan_data || !ctx->reverted_channels) { av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n"); - ret = AVERROR(ENOMEM); - goto fail; + return AVERROR(ENOMEM); } for (c = 0; c < num_buffers; c++) @@ -2118,8 +2114,7 @@ static av_cold int decode_init(AVCodecContext *avctx) if (!ctx->mlz || !ctx->acf || !ctx->shift_value || !ctx->last_shift_value || !ctx->last_acf_mantissa || !ctx->raw_mantissa) { av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n"); - ret = AVERROR(ENOMEM); - goto fail; + return AVERROR(ENOMEM); } ff_mlz_init_dict(avctx, ctx->mlz); @@ -2133,8 +2128,7 @@ static av_cold int decode_init(AVCodecContext *avctx) // allocate previous raw sample buffer if (!ctx->prev_raw_samples || !ctx->raw_buffer|| !ctx->raw_samples) { av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n"); - ret = AVERROR(ENOMEM); - goto fail; + return AVERROR(ENOMEM); } // assign raw samples buffers @@ -2151,17 +2145,13 @@ static av_cold int decode_init(AVCodecContext *avctx) sizeof(*ctx->crc_buffer)); if (!ctx->crc_buffer) { av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n"); - ret = AVERROR(ENOMEM); - goto fail; + return AVERROR(ENOMEM); } } ff_bswapdsp_init(&ctx->bdsp); return 0; - -fail: - return ret; }