From patchwork Thu Apr 15 02:04:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26920 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 40E8E44A46B for ; Thu, 15 Apr 2021 05:04:27 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 27F3668A67E; Thu, 15 Apr 2021 05:04:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065049.outbound.protection.outlook.com [40.92.65.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 725FA68A329 for ; Thu, 15 Apr 2021 05:04:24 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hjRJL638wQzLMMhPXca5XxP6DTkuMJZedzEfjuLdr7DxHxDK1W1drnb3tAPU686NeSvkRnzpkX4pUfuH39oa8w911MMoTi60fHUQzfaMqD9G5vOcGexw0KX60xMV1aExWe6Mmisevbnla2ywPzQQsnsutslfqQJ1BuScC2vUlVomcIV7ds48E+P1tXIXvNnhZhat3TfqJkvhXfynlC4ZekX/FsmY1BpfaS3dXwfCV7j4Sj52jOOfnNdG2n27V/1k6jAriMbsmiHBxu1WJq5D7UoROaNwXn9FE4dfd1H2wBNrLLrN6CSZGTJxVWXAgh9UtKT77EqFGNhHYe02k24tjA== 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-SenderADCheck; bh=jymRkBHBz+Axyv8i7r2ifYNXhep9NmPubdCeUlSYebI=; b=d6BLBfauq2VLloYhx8A2Bt0P33K0jbzx6EKaR8k4nxXlVBwaRmt6HyjmmLG6RfXEQ9R3qWQmKlUu6OLgI1PShfpllMBHyPD7zneUDNLMUeHSg161KACfwhFQJoQrhrW/Lhjpx8VlaMm2/E3i6IOTGRS/QC2LnZF9rxtw2v9f/YQOTv92EBqkfo/ItPi3Ud4ioLd7ZBqZ5PCl5ezhaT86jf7lPkIcgiVO2k2Af7pKr2mdwk49Wokbh43NzGYDnqfVliSv+4s/C5rrYRnYzxgSzCgHYu5DJvfnoU8m8Fn5mx2L/vYRL85jGDB+lYldh50gBWj4W5fD7Pz3mFgjvxYM+g== 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=jymRkBHBz+Axyv8i7r2ifYNXhep9NmPubdCeUlSYebI=; b=PBTmrrOEhJgUbmI9ip+Yzstgj6m5jxbY//0AI9ddORpiHcpeCQbxqEUzZm2K/CgDh402EafSW71kRUUEneTTFJa6GioXX8hd4diUzO2/JrNk8h/UIiQDTk0FHQxrAVnChPPP2k6Oz5n0YIdHYG/DP/cl3tftdsWfI80+GR3zg+48LFJVzyGKyccC478hzDOMpCKRT+ZW8G8TrYoE7vfbEEoF7SoPMs7/VHC4tNxJ53JuTKWyAsaP8Xjpdy9Q65slgBgdh4U4k83t++u0jhabrUYk4Kh/tBUGnwjgyXQR2lqext0xiXTleN2EmTGkfDRPrfJ3XIzHZUobNIerAw3nPA== Received: from DB5EUR01FT021.eop-EUR01.prod.protection.outlook.com (2a01:111:e400:7e1a::48) by DB5EUR01HT186.eop-EUR01.prod.protection.outlook.com (2a01:111:e400:7e1a::183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16; Thu, 15 Apr 2021 02:04:23 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e1a::42) by DB5EUR01FT021.mail.protection.outlook.com (2a01:111:e400:7e1a::245) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16 via Frontend Transport; Thu, 15 Apr 2021 02:04:23 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:7C56711F8CACAB20398F0F7BCB56835FEC6221D2F5785C9730ED5BDF5603FEDB; UpperCasedChecksum:591352383B251A21B957A92CB72F5FD4CF2008718CE139D04CA542CE04DEE0B4; SizeAsReceived:7595; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4042.018; Thu, 15 Apr 2021 02:04:23 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 15 Apr 2021 04:04:10 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [nxyoJLcz0AARbCCAX2UCP+qcE3PqWNZn] X-ClientProxiedBy: AM9P192CA0002.EURP192.PROD.OUTLOOK.COM (2603:10a6:20b:21d::7) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210415020411.1411024-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.96) by AM9P192CA0002.EURP192.PROD.OUTLOOK.COM (2603:10a6:20b:21d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16 via Frontend Transport; Thu, 15 Apr 2021 02:04:22 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 6c5db4b8-c936-4265-b95d-08d8ffb2c9fd X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTEEqEyiKFNUcsVK4T7qzgRl0R+FM/hAwPimsUXwYMjTaFSJrbBR7AgEzR6RSThbbCjKlISft3Almo1G+bR/jS2l/Nz3xDAyeIscfxrpdFLXYBe/0Df0aw53PfcTvLPrRFHb+27su6+xs+CxO2g5HgsyIwfFAo0/TnEozkC/Uy5n0L/vpqqvae/UZ9Dn4OU49sxVTwrRRxSbtRjVH//GmeMywf0F/OKWyWwxzDiUSkqYG+4aqkWFFKCgGvZuvKtOW8LYiF5uc1Uf2DyHlGnjMJPcqUbsWQyfQGjF9F3q7qJlQaY4tGKL7xWnRWO23N0xYOJedEY5h5WryXqphgeHzlmeo5UQ4I60ZwY1MhD63gnxG/KUEhk3qlehhZqi7SkFPGhe0RyzbgPalzRtyg0MPDuuKVnw5gXr1qYVhpNN9hBQDoHu3aBwCwE3vYzXeYf51QcJt8BU2efLdMMq5B2Gfqiv5vHUIG+p9FEx0+nb/cOEyfzSL9mKkM6g+bpoHKWw/N1JplpfAtzoZTsSwwPC9Nn2t86k8EU0v5WBu1DEnP2VLu+sU2/weumVWWrRDYsJ+Ag05h8Mlhny3LbRwJEavWk9Oy+zzYvZkLIrH3NBfOrgDdoATz0/KHg05ULsyfSOZvZ/8N5mclVGvDYuSdlZBeVVvS+TLsZLtoV/e5RW/Tjb9KPesnFw16pKn1PTjX3zSKFDZr6i2WulUpSCJzkDXzCte1pNExSDtTvcPkxfIpVvydnQoTwJ/3NKox/oJBkRwQ= X-MS-TrafficTypeDiagnostic: DB5EUR01HT186: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MIHTEwJV9UBS8eALx5Wla23qeZWhGUVeOHCaIcxd7h1edAlt/YTgVw88XPSwdAmVXhj9OmjdQgYoAsfqwRlE+deBERnALvYDV04VsA7AIhQYJPJ0eKcxENTcuUC3xyhFZEMK/5+a+Sh1KxTbTXrNu1hwfVa8xGZG6CPKL5gSsxY0dXKYi8tPI10IPFOj6uygYtKnQB/11JmtYju4VJ+ds4hhg/yHQgx1/3v7ztO0mpC45bK+dknkNkre5OnKMSz/E+pj+5veLVypzawSPQ5rlVwhtShxIvX/KJwcPelh4xbv8LKfh3pkPFKFXCbVHMKQD/9rj6ctIxgVr8mxmx0gAcUlDpPU0TFXiRahBHbKnqVO5IHg8+X1xkUc+QCflrLtyMumyrTej45ud0LWW2cllQ== X-MS-Exchange-AntiSpam-MessageData: tQNdi5ZCuFJxZdVLtVSOHQrGp4xnyExjODYMxRdjtf9n/K+Hw02l947kfxdzYDvbEOpUzlcRyNEQ5fTO7NTZoddgoVXN7425pEfp8MEPPbZlSObZdWKZqGe3DS+c6wc5Gd1YnioMXtAM7bXByFez/w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6c5db4b8-c936-4265-b95d-08d8ffb2c9fd X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2021 02:04:23.3054 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB5EUR01FT021.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB5EUR01HT186 Subject: [FFmpeg-devel] [PATCH 4/5] avcodec/libvorbisenc: Actually set error upon goto error 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/libvorbisenc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/libvorbisenc.c b/libavcodec/libvorbisenc.c index b556280a95..061a4e9da7 100644 --- a/libavcodec/libvorbisenc.c +++ b/libavcodec/libvorbisenc.c @@ -263,7 +263,8 @@ static av_cold int libvorbis_encode_init(AVCodecContext *avctx) s->vp = av_vorbis_parse_init(avctx->extradata, avctx->extradata_size); if (!s->vp) { av_log(avctx, AV_LOG_ERROR, "invalid extradata\n"); - return ret; + ret = AVERROR_UNKNOWN; + goto error; } avctx->frame_size = LIBVORBIS_FRAME_SIZE;