From patchwork Sat Oct 1 15:46:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38495 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp351678pzh; Sat, 1 Oct 2022 08:46:12 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6zrL3KeHGAmpdyywVLSt5TNxieUeWFADQVM89kOHofGElGsvvcXpdcWeqtA7OiuXtwPv0W X-Received: by 2002:a05:6402:1c19:b0:458:c83b:6253 with SMTP id ck25-20020a0564021c1900b00458c83b6253mr1538772edb.313.1664639171830; Sat, 01 Oct 2022 08:46:11 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id oz7-20020a1709077d8700b0077979f8d3dbsi3833403ejc.838.2022.10.01.08.46.11; Sat, 01 Oct 2022 08:46:11 -0700 (PDT) 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=h+c8ZU8k; 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 EFE8668BB25; Sat, 1 Oct 2022 18:46:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064069.outbound.protection.outlook.com [40.92.64.69]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DD25568B61C for ; Sat, 1 Oct 2022 18:46:02 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NXe9chErARyoKQ+fRsX4kXKh6G36PHIJFMRV59ubp3KUqbXuOomrEoNP29KzWLEdzCSUj5mSpB4/CFe1KYbtdDAwEnAT3152s2Jf55abVaMRTXmNJwgBJmlYMJ0xeFzSfnlhHzUtKuJgbfPxSDU9QOBXio5eUiQOj54PiXclh3BuB+B3aFjW8hvhB6+cKj3DNUH8j1DoBXj+iSeEZSnw/rLHUTOjxPiBwG806irmMGzTjDGnN8oaerg9dU3E0EPYiYOntYLrCqZsK0vfcy+yUcoj6P1Sz+KtXZ43pEF5DpoGdBsaXvzHo/HcDWElJFmQvaXsTG7OnXH4GV302SK44A== 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=xjiOxOEeebxnpH4LvS4B/O4XofI8DV6FnxSMPcm93XU=; b=bDp4pmMproUN02ztNnhdkLdsATTSyYQqfYMEG31FNGhwJyend0wzPUYEOl2n6zOsOQflOVEx8BYbwWS3DynLo5AMa+p4fwzzLl4nkEESQgmrxs29Oli30cBp9ICpUVJaYN3T6WLIqtQohTBfyA7XIHINqddqPwT+kCJvnemQqbH5L+qNybZqeSFKTneY3bxr3SuJ/GHTCpiReepFlzZeO0e+gjoKpgBnVqa6GfMykh3ztX14FxMNOnjDSIE9iuayjpenhJBFlYBfcZpzj8ihoneUxIu+5D+FmsnfYBi0VXyhEX1sGIgpyfimgB/hj2cE4pyyFmrRIcL4QHVT2GxrKQ== 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=xjiOxOEeebxnpH4LvS4B/O4XofI8DV6FnxSMPcm93XU=; b=h+c8ZU8kyWpShnT6SjZcKtJ45OqLO2XwK/MDkuvpED0Nm++Qx96CjNx76TGmBnm6leTS7lgekq7l3rLhfwUYEASbLbPDWSjwUc2TTZ6BTQfJtzJ22IAro3lWpavVAujomLnhfFL8BlpAPKonK4RwzQ66K52WYkaH47OZ1ErezK3KzFLexyaW7vR0l3hzqwUspCmp+URgrUaboEUx9r1T3jjcO9tdsTFGwbWUofUrNpdheerZE5VKCGoZxQ6dc32riC1lLR80VRaKCgQ6t//ws70jlLANTIQhXXpriYxUx5iAvZ57rN/vf9VYx7/bl/UN7bMCC7iRCXI1WlXSFPw8eg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0037.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37f::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.23; Sat, 1 Oct 2022 15:46:01 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8%9]) with mapi id 15.20.5676.023; Sat, 1 Oct 2022 15:46:01 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 1 Oct 2022 17:46:01 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [6BeMbwBG1jxlgMlyLQkBE7tHBoe+7I/cjrvNrYnuBHE=] X-ClientProxiedBy: ZR0P278CA0105.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:23::20) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20221001154601.4133221-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0037:EE_ X-MS-Office365-Filtering-Correlation-Id: d9180ef8-f526-4c29-9ac4-08daa3c40a9a X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmqRS+LhpAttTSirEIY6pZkUjA64DbQjFTBCw25hcA0EPwryPsYV4GX9uUwhH753UzTWEOzlkVPowv4bdNSJuKj3kli3d4cRdevIj3ctLsZofsjRL79DemOhwyj+G5Mey51LyX/KKjHGBvbBl5JPb89GGDQsUP0Y9+Rayk5YcRxkwlZQcK83m17Rz8erYqrXIyp6KX76jp89XkRtgHeIznhd6q42Xzmpx9o4PjdHiD3E4kLQC6i+UmK4QP378qD/vjtzh2JkJW70/oWWEjhV+isro5BN0KxRuC1j8Q4lhW22UvVArXvonVN7m1H8PUZfi6B16oTAtF69Srbw9/BTFBbchKhQj2woflsNljfOk9aZ+6GQZLiYHIinmaklJigW0djf2/QuJnW44/M2p+s3A8rkcaFVR3fyvFfFLFoYchXMprjj4zaJM8WqIsJ9evAgdsUf4cZ1fT7X2iEAcLiA2/4BJoxuBN/jFYvhHo6OzFHmvAUAbyk/V56Kn8V3LbxSmGuhvpZM42WManUqn6uqEpPhEMaecihQnq+vNeYIgSL4NOXHu7FzbLyuBAffRpc+5t+Kkpt/AC6ylcHWyPX1nkcZytowDQCJ+YPxcgBei3HUUgW5s/vADentMtvWfP8pMMIYJ/edB2UnY/DxLKdM4RQh0wGunDw9yjf7OJA7hnH54eg+wSb4kUx0WcssUmQ/lu+0e6sJ8DriF+qFryYZBp+AnDXlz5OBEaOtkp4LKln0wbOjgi8CBjhUq27Os38sPQc= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KHlb5Al2K0HsM8YNjw0x1UZbs0Le4CGTsFj5IRfmFMJEddorVMo9UktutgWX4YXMGVZ8q5U7y0Gcvlo86ghOT5jfVmI01uv/S6ogNc8YhMM65sarPbrr2LNloU4AnpfZycsSNX7wO5DFFx8I0RSnliVUMQP5nh/vYDLNHBDhc6GYoK+zV8mQMhmDfEiHeY3P5LXYptBEBf1LrybsN7L3u0YNgHPIJH8NNIzPAFmv+R8ykiICEdp2UMY1PNq+eYw0N79O2k4GtQoqC2Py1UnJHaLzOrKKUrzI2W5msOFoPGjoOeBFum1gMHwpqDZ1ixsLXfsv3ijYsPaxVwn3OXFjcYdIemuwqHlIOBeY0iUnMyuEZIaedzBj5s2RldDvke4If5ilAxZU0dNwHJoqv15Z59jTjGlWccaFb2eSQEhGnCH2XhOzGvOzeC3sCk16H19LIrWaiefT1k4Cg9c6hGNPcqcNpWtltvk2CjcAR5PF5guplDneXGjnRyO7MykruuHKv9GnK4wWQCNdotpHiuUGIUCtgPe8GhHZkAneP8Vz55yFQltftT+tFVgfqNpfyU/wIQ0dkPK1Lg5AYiyObEq0H1zn+vIkpFY7yYmDhGY93Kt6B4o6wZI+sFIpbKj/UXGXaiYUjoEXAHrIZLFMu54pz0mPGZVjMuLbmzI14a9tdJICliLKo3xflb6VDDQxOedi X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8n+OxhB/H3eaKjr6PFYE98up9DSTdTuZs1c3N+DUFJZaSQTrSh6nxdxK+LFr3ycqozA0usHIRXYGvE4GdKAfJEx215zBEzY7CR8qClTP4ZvinrAy6LDKJ2Tg0h2/l/RYVH+rpDBikOH80kRekNvk4074wUhky+CUKzLRgTICWJORmT8tecdOIPOw8zFb6mKzshNjBRFHQ/2Asfe3z5hgyNGgQUcGUaHg14L96lmerLTvJMu18z0v4GXDmsCwkG9j/L0Lksds0HtvUjck/xTOLdJ+QN42BDq4f2NwDoJKXFU3IQHmfaYLZdNEQW96ktoUEscrZPRnHErV6cWbVl56U3eL8wLEbBNkomObLzyJlgRMFBFkRvhYG8eaDA7FDzliilPLs3U9rUoQLPneEORWJmoGdGUNIWF2UXno/jwqR8ji9c2JUm6FyFSN5eAlg+tHPJcOLfeAEVd30CSFfc0nEASjTb7//KxeAbyq3ywMU/c1YJVpIZocMXAhg1x49jvAfuRioDWZPeiU6Bngt6ik7NVrXJ6bJUazDAII8mKkczFDnRKo7NSMk74dWov6j04BR0ZEPuNYsRPhIaB8cmfMb0fu/3s20VapMB5X2jCCUzFUYxt9QhNX/YTcPwvMfF24xghlLmhsSQaMfkp3AbcsQULVMvpzz0OuaL8Ro2Au6mdWaTRnPKAeQkcKFc8cfonWWTx6I/nCrtjw/7q+3ShIyu0lg4rGDTbf9UdZuoZPKw1Gcdt9DgA7XTBtUTX4yy+3+yNYkrXKDyjOluSqO3iaUz8uMdIirvkQ9hDKHpDPDIgYJi5hbt5F8FADhkaZZz0aWiTRUGR+Mcf3bEQxtaZyEzOl7SqfVmVaAeGWskCrnRb7ntt9HLu6Rm2wHG6TnUlcaXyxYaeMP2gyl9c/gEkvehEX32uhSYv1dQzEw6KVz5b9hS1iw7JEDgurZIGxT3wjrEDVmkM/nQsOhCO/88ZGV4+0Qreyi9HJuCeSA7CwEoVbxcNZU5PtxBD/13nAp05n0orMEQJHE7G92DIo9ymHCNn6gfSiydEwYv5Ya2E3Jiu1L+NTC9D8advWCqIaiZnxHmFuBIG98yYv3SlCEmxsr21B8cFymHhNJ7fj5cYLmcbtvi8+nySsF6SI7m9LrYKgpkumaZ1g8XDUcLsTbuEsKtYkiUL5+5dfdB9Fh7naH8wA3Fp30EKFr8Dc43Y6+WJUNgL32nqBIi+czkUUnnj9jx5Mab6Si1SNuBHLpKEQZB8hoZG+1AB06ecF1fl1H9kJFL09nZvhtfxorrV314NjHsUm4OpkOVO8sKWfAjMUT7iO0by2ZEiDWIcvpt6Eal3W X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d9180ef8-f526-4c29-9ac4-08daa3c40a9a X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2022 15:46:01.5355 (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: AS8P250MB0037 Subject: [FFmpeg-devel] [PATCH] avcodec/sbcdec: Remove always-false check 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: Rjt6+LBBTeRW We never guard against a user freeing/stealing the private context; and returning AVERROR(EIO) is inappropriate. Signed-off-by: Andreas Rheinhardt --- libavcodec/sbcdec.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavcodec/sbcdec.c b/libavcodec/sbcdec.c index 3fac2f5016..fd7c2e5e80 100644 --- a/libavcodec/sbcdec.c +++ b/libavcodec/sbcdec.c @@ -343,9 +343,6 @@ static int sbc_decode_frame(AVCodecContext *avctx, AVFrame *frame, SBCDecContext *sbc = avctx->priv_data; int ret, frame_length; - if (!sbc) - return AVERROR(EIO); - frame_length = sbc_unpack_frame(avpkt->data, &sbc->frame, avpkt->size); if (frame_length <= 0) return frame_length;