From patchwork Thu Nov 18 09:13:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31483 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp503840iob; Thu, 18 Nov 2021 01:14:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJxZ/fpbyvKrE6747yq0Gk7+o+bPIj/sovBSUDtZOsH0Tgd0vxRkc3wFPRYUtctDZuAxBD5X X-Received: by 2002:a05:6402:26cb:: with SMTP id x11mr7770085edd.149.1637226877580; Thu, 18 Nov 2021 01:14:37 -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 x15si1474412edd.589.2021.11.18.01.14.37; Thu, 18 Nov 2021 01:14:37 -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=dseWfS8W; 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 7EC9C68AF32; Thu, 18 Nov 2021 11:14:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2073.outbound.protection.outlook.com [40.92.90.73]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EA9DA68AECA for ; Thu, 18 Nov 2021 11:14:18 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mgQan0KrJ/EbIqvnuAbAXb9WqU1R6FyAE7G5febHHRygljJSV5+IJDX4uRowhXP5p1IyVX58aKS4SDycyWpPJd2gMCM1fZDhSh/XTRCPj7qeDBCgiVXwQPaEfgFQbFrnREEUseRoSR11rGZHNB9kq1j/AsQqYuJWO2JVWPNyfHtyM9XSABkg5BVJwE4TvJxJxZad6VlhYBgSTaY8RyfUUSuxQoSM1O2jJgkWTlmdTjJTA47xnOsJLjicl8SVqFWNzowxxp1bnYg+BBRZtm2e6MGvGbVHUPQkTeBVoT9jDyGuSv9Ays2lKycBEx6gIAZ7bLZDRPRPs+dGn8O3hEsjUA== 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=dqeJH4ohDXY7PK7EF5TqrjcEKhrGwT1ZhZ1eWQkGoI8=; b=AYw8CEIVzntD+ky1fEPKEpJGnLGCTEEATKY2qeou3aFbUbSq1Q5kdX912PSJuUZMzQjNNMOswhM5SANNUZ0MO/v97GbpOV+L6H3D3uCZzEyETylFWJ3L5JTyVlYDf/fBwap0WsHKrtT1HOg1XOXYEl3E+Jd+gNJzr8oyFLIvVyn/oWrHAPX46jmpEw/pL/o0dDNKJsHNdvpbjiWO5FKalau1PNeUQQl/CIf4G/rOlDHFj8wiU2KHRqG6uUX+/pdkDsZqaeDdYK0fJbe0UIg9X2os2LmUeq4vdLLYQU3QOhM8jEmHTSQT6g140nG2Icz2wIph1ObB2Mve6gkGt/mOLA== 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=dqeJH4ohDXY7PK7EF5TqrjcEKhrGwT1ZhZ1eWQkGoI8=; b=dseWfS8WAouRNbQaw339UsrZe27Yq19ZzONRE2Oz3zFXPX5hMT2V5NWOObSq91+IvtvjLcULSNOSy8B0xJ9GxfuwMsQM5bkpsXLA8xnYOKZ5gZnVh1Lo8DV2rpGOsBN8RH8vS62MmwKjswEEQqKK4eQdosgrbtxAe3k/kGP+2tH5HsgSCPPeqU2UL1vRWatRrH+icIiqEUOSsRKt6n74vZl1UWjUFb458wj/DecRZG6xRV7nN/I0whlGh+jzYt3ObpQyLgviR7iopHS9UwgNPCZQ79RwSgiW/yYJUJ+SzPe2z0nvMFh13KiewN+s3LYD1bEUygp9oRc3efmWZSl1Hg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5703.eurprd03.prod.outlook.com (2603:10a6:20b:fb::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.15; Thu, 18 Nov 2021 09:14:15 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%9]) with mapi id 15.20.4713.021; Thu, 18 Nov 2021 09:14:15 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 18 Nov 2021 10:13:57 +0100 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [gCQlQR63hvKwJjvchR97vAX4MuPs0vEI] X-ClientProxiedBy: AM4PR0302CA0004.eurprd03.prod.outlook.com (2603:10a6:205:2::17) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211118091357.223580-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.12) by AM4PR0302CA0004.eurprd03.prod.outlook.com (2603:10a6:205:2::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.19 via Frontend Transport; Thu, 18 Nov 2021 09:14:15 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4a84641c-22e7-448a-a915-08d9aa73cb21 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRs85NybYSQmoa5lJW+KeisarAnMn51rzW/fZtnWcU0s+Vhn7cv7OjB/AMn5J0mo6koHdU5qS/jZm8VhKUaZV4Sa2+9jepRRPP6oennKTAyIb42E1XCeNVjILy/b+kV05b1sZNaT1gciP+6wgz25lf6pOGCPxHGw3or1VTSVxpGhnr0onwi9Oog4IvSQK+wBU2LwPps7Z/9Bc7S/wLVXw5YLZqHuzJeKBDCDfkuxvCrFdI4wPbnOdxWYFGy0me6LlLpVL7ZNcf3UOCn/9R5x44N9NLVpgn55tmGAYg1mGyMh4LRmmEXRFNBQATuwtw8SV3uC1ndxHjDuZQcsNXWB39jAmR+tn7js9chQW+pVeYbw/QCE8fHQ2EIInfUSs4oATMVdb/GcC42I8jpU7Mhe4y2RfPo3+BlGm37KtBt58dTEiM7t7vESa3Tq9tO2hROkgV8Lh/cXPATVT7OAnssltvYWT7e7tEu5jcBbxvqeV2Mjtfr25HD72DU6MjkbN+7HNbXpEV03AJhzBp0CueQTeZkXUugwcTnOAtk1SHvhqRud8ZAOM++jLqCwHJbGsbKxrbc+TSY9M6hF8EdBfMGsw1pmipzBtQSLQo9/vK31nEQVFcGI9t7Kdn95tYdsnb3L95bDeOToTMKs2piliupNKKDEQoPbV5gmCqWtdtaAE5XyU6EhD7mmZuicV9qtO982VQkqd/R31yPEctSC4TIndPbYs2Jzo/8lfYmvWo7IW3ODNyMKg5xvqiQYC0Z4h5NS00= X-MS-TrafficTypeDiagnostic: AM6PR03MB5703: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jNHS2zNyuXAewArj3vWbwd2ycU+ezLdGfTL9WaRSeor+xNCiYcvCRKI7WxQa2mFtPmZRTt42Ey6wvoWKHs2eWe1GIsb5iOMo/w9tqa+Q/n7nNKDYE9pA+vnD85CPYvCh258EqBDdf5nLxvRvzBavk95h82oQOzAbwrMNFkJ0jwUGVBCL26jZtOalLZkwoSQUrZgMzPd2xVhZ7sCb5Xfeh2pFxeaM0L0wNEKmHy2guoRze1EGhJjly46Ngayt+C60pMVabPta2xpZm8Fi6I7wrzteZQCs5uUk/i1YLgNNcYmJItrXP9zmQ1ffGFKl2VSBC+3tvs53cYWMNNWWHI6+o649Hbdv257as8u0GkrmDtbz0qX3n78naQUH/H90gjf/j48kR95I+2ZgFn6V2KmJ22Qac2pq/k8aS2TjOOeyEvW2Z9h/IthcnUriQnLYWWBzpBCsankwzr5v24X/kTR5hcbQgX7bkU8By+TiCb1l4kGNpMXFmVUE8YCdYRB2AMM9LM9IMyPouxr98AUmNvxMOEEHYub+ClRUrdx6Svkp2aI= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: k+qZM4LtrMnajxmG1K9I92h0wMW1nCXKKTUGUFQJi+6nB1HP2uhm0ytDDIIRV2nj4fNkniISw6f2i7gcf7gUH8iBqmRIibKXMdEtCEmxe54XSBh+s4F2N1nEYwJGwh0UzIIkr8W4/y0y99qQuk26evvX3kWbzHd6DlFIW/4uAx/G17twtWtpcN2HoU34cBNENj/WWt7OKBrxa56v/RTr/LJL5qwJphvbUogokV5S0h0H3E3+Llbn7RZQnfTvT/BI95vfr4oIupYKJqRRQI1Z7R6Xr/3umae/vDVdVN54gTZw91nXYyHVGAFuLZgDAiLZzwqMeC89wVOkUQkc5NaBwUIFkYOMZonOlMiOCIgysKtka1mBi8H8FH7bxUXQlA6UQwJfzemrSKmsSQ0N5bfVVd1YxovcsUHsgdv05ohFAfJdKRBpuItmT2i1FnSJfen/qe0IBZ0BX3os9EDQlOWh3hHz9JlL698dxXDIEeVJxd5k6GBomVGvSWlJMhxI8kwXyeK9YRrbrrWyuEXV1ZjzTSKHGWrhXf3xPn9UgZKSpD0nJU2Cqs1vMUHMDwjMt/+pyVlZ3t8Y4u0EU4aGj57+nLB/vNmXwSIoeuy+EP23IYWRFEP+s1JEC8cd/mIP1u3UsfGbaj708ErUUelB+oUBkeQHlDenX3cPNT6/S3UR8hpCKyG8npth8ORNkQ3Cbevb5vpUpWbA2BPYn++lNnATxQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4a84641c-22e7-448a-a915-08d9aa73cb21 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Nov 2021 09:14:15.7678 (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: AM6PR03MB5703 Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/mobiclip: Rewrite code to make it more clearer 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: jwRfnDCeYCkp In order to know that the earlier code did not use uninitialized values one needs to know that the lowest four bits of each used value of pframe_block4x4_coefficients_tab do not vanish identically. E.g. Coverity did not get this and warned about it in ticket #1466632. Fix this by slightly rewriting the code. Signed-off-by: Andreas Rheinhardt --- libavcodec/mobiclip.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavcodec/mobiclip.c b/libavcodec/mobiclip.c index 6ea1c3eefa..23d64f76f6 100644 --- a/libavcodec/mobiclip.c +++ b/libavcodec/mobiclip.c @@ -491,7 +491,7 @@ static int add_pframe_coefficients(AVCodecContext *avctx, AVFrame *frame, int ret, idx = get_ue_golomb_31(gb); if (idx == 0) { - ret = add_coefficients(avctx, frame, bx, by, size, plane); + return add_coefficients(avctx, frame, bx, by, size, plane); } else if ((unsigned)idx < FF_ARRAY_ELEMS(pframe_block4x4_coefficients_tab)) { int flags = pframe_block4x4_coefficients_tab[idx]; @@ -505,11 +505,10 @@ static int add_pframe_coefficients(AVCodecContext *avctx, AVFrame *frame, flags >>= 1; } } + return 0; } else { - ret = AVERROR_INVALIDDATA; + return AVERROR_INVALIDDATA; } - - return ret; } static int adjust(int x, int size)