From patchwork Thu Aug 12 04:59:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maryam Ebrahimzadeh X-Patchwork-Id: 29483 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp414905iod; Wed, 11 Aug 2021 21:59:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwpYrVzIXkRwRN9IbNYL27t0ooOnn7XsFcKmG+hHRAlZP/6VqnGjtHXJ8xfCrV6g6KXtlC6 X-Received: by 2002:a17:907:94c6:: with SMTP id dn6mr1938509ejc.287.1628744378511; Wed, 11 Aug 2021 21:59:38 -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 ee28si1499688edb.265.2021.08.11.21.59.38; Wed, 11 Aug 2021 21:59:38 -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=jUoiTh6c; 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 4AE8768A412; Thu, 12 Aug 2021 07:59:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074103.outbound.protection.outlook.com [40.92.74.103]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 43D5D680068 for ; Thu, 12 Aug 2021 07:59:30 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q0p0CwvKJ6zVsWk8UkV7QTQrfeygrimKMxlzlyg7dQouPsmt9RcLSuEZiY04ZdABj7ec4cfvHgMDWf5Y2Ys66mb+qKN9yVJGRJVOK5CrUiPWog4vRbJM6YZD3786nCwkHHdR+YxwwURdOvuEcCJB10Tg4V6gigyA4e8jQAiInOATz03wEYrbode2XwG+X2nRRDPIjGFmtyKBnnkeI0YVX713KAVLmxpnoX3wWM8n8mW1gUX9wzdL87vSqUZ1aq3+hv5A7Ob4vkX1sYhV/UeTYRdqNFJT4GxnChsrkLzztVa4aE8DEvea/mT9+Fd30nPHoEGcuHV167YAuATI+T9bGQ== 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=GSmJzfgmrV+PSsnHzX5NCs/YCn9Hiw2rD7HLKJHFrNo=; b=KZYiNMqt5MPjxnfzdrIUDkZ+9p5c+XMjABvkubNhyjwcJlM9DP879w7lBN0lEVvSDB62GH3lFIsOhMQPfRMSAmOPOawuGk65IN+Y3cOF/2Nunx1uiQ9/O/jdRt1br6NnZZwsvu5oczHDQV0kfOjZtf3zS3eAnbsxSUeB1RUMFlq/4n2TJD3lE3T1eQ2rDVxixDNsJbxfdinItOPjgPrRYRez+S7uayfJBtT6BVe1rp0REL1Q1blpk5cb+lwpFj3Yd2PHYJ3tsvUrIdu8Bc7KFkgc5bqJQUVZdI9RaGBZ+xhmeOSpuGZI8nfAEw/Ktc/hMU60RtrF4m6y+Nu/IZexRw== 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=GSmJzfgmrV+PSsnHzX5NCs/YCn9Hiw2rD7HLKJHFrNo=; b=jUoiTh6c1gmu8GV099/rkqdxeW/LK0Y2L7mmTWgMdlDzxiFATqGF5FdyTv+lkRRsJ+pFQMnknCTi+eRZIXdEnYeYhABhJvpqub6npBEDPIjt7gHXiFAGR3cujqEbL39nkXgw/SPlCCRVm0KTCSO+dZmw7bLvvLu0RMuX3bxqr3TI45k8lzmnK05Y2qSSrdTUuny+sVTdYeu8yJOo+i73SSkD0csAiZmDGQlVdDJ3g8QnLip8+UrZzHIbL3DrTve2f9V+dBVW90tjlI1sWUAc1WAHWhOuL+BrwnA5gUc0XG2LMAcqfkEylhFZbTJ5BmgkVFZ0ZZOnWXRzt+U6mbwmQA== Received: from VI1EUR04FT026.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0e::53) by VI1EUR04HT202.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0e::112) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.16; Thu, 12 Aug 2021 04:59:29 +0000 Received: from PAXP193MB1262.EURP193.PROD.OUTLOOK.COM (2a01:111:e400:7e0e::45) by VI1EUR04FT026.mail.protection.outlook.com (2a01:111:e400:7e0e::127) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.16 via Frontend Transport; Thu, 12 Aug 2021 04:59:29 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:F8392D7BFCEBAB3769F3BE7FABA8C9113F3769E31E6B1A4FAEE40780F9D76DF1; UpperCasedChecksum:EB2DD45F2A7C3FC88BB241EACB75A3262BC8B51E2068BE27C0767BB3CB9C8E63; SizeAsReceived:7164; Count:43 Received: from PAXP193MB1262.EURP193.PROD.OUTLOOK.COM ([fe80::b1f9:e0a6:6946:9c81]) by PAXP193MB1262.EURP193.PROD.OUTLOOK.COM ([fe80::b1f9:e0a6:6946:9c81%2]) with mapi id 15.20.4415.016; Thu, 12 Aug 2021 04:59:29 +0000 From: maryam ebrahimzadeh To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Aug 2021 00:59:17 -0400 Message-ID: X-Mailer: git-send-email 2.17.1 X-TMN: [5/Vo/S0+HTU8/yeUaOWKwb2JIyBumgt1] X-ClientProxiedBy: AM0PR03CA0058.eurprd03.prod.outlook.com (2603:10a6:208::35) To PAXP193MB1262.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:dc::5) X-Microsoft-Original-Message-ID: <20210812045917.5241-1-me22bee@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (5.74.0.142) by AM0PR03CA0058.eurprd03.prod.outlook.com (2603:10a6:208::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.14 via Frontend Transport; Thu, 12 Aug 2021 04:59:28 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 43 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 19941293-0f20-42c9-3c1e-08d95d4df70d X-MS-TrafficTypeDiagnostic: VI1EUR04HT202: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6SY63fYhQpYnqhAraEsRph+rMaU+HsWJm9WURUuKh+ZwJGJMHIdEIvQm0QnwcZ3B/d4j/7ecNcjRjAuFbeTqVwLyK1m5PCzwFpZ5CBDPgrLtl5lXBLxrtM1AAtuIU4NFi2By2fL4UWccSrKDGhezySUUkpJ5gPZT8/JwPVsoyLK3pJqOmBjDGM/f+k+7hRhfFxgyHzn9otL2zbbm76KxL2kTk6Ml9tfuTXVBRE3wgbkSmuuOvG+IbJVnIEKs3LvWlkfFDmNCHvFIqZ2y8f8Bp+7gvkN61VLOpAi1Y6Jgr4OkF5HCEGhJjeyFUAgHFb9Z3w2OLCAHeGEbxpepyPixacTi3UayHmSNVRjm9xKqf2xPQU7xEuag4LhfdKyDAlR3GsK18cqR3Nl7Ssy9crXDbVJhZ+hjJ2gILh9JuPNcIg5wc3edljW8sKJOkaKuR9ju X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wzEmdOCuDnu44cawgIvw2DIY1TubjgIdVZBMq21YYbdoPOqBoRqmv3syWpCOuo3kY7nBf0UF3wzrGY3SAXQZc2m8gsn6X6yAjI29FY038t0ma5+CUE2Alfoey60wT2cshXz/QsnoekQz4vCPg9bgvg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 19941293-0f20-42c9-3c1e-08d95d4df70d X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2021 04:59:29.1098 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: VI1EUR04FT026.eop-eur04.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: VI1EUR04HT202 Subject: [FFmpeg-devel] [PATCH v1 10/10] return value check for init_get_bits in utvideodec.c 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: MdBtwkMwPy0r --- libavcodec/utvideodec.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavcodec/utvideodec.c b/libavcodec/utvideodec.c index b39d8a7948..144992ff0d 100644 --- a/libavcodec/utvideodec.c +++ b/libavcodec/utvideodec.c @@ -153,7 +153,9 @@ static int decode_plane10(UtvideoContext *c, int plane_no, c->bdsp.bswap_buf((uint32_t *) c->slice_bits, (uint32_t *)(src + slice_data_start + c->slices * 4), (slice_data_end - slice_data_start + 3) >> 2); - init_get_bits(&gb, c->slice_bits, slice_size * 8); + ret = init_get_bits8(&gb, c->slice_bits, slice_size); + if (ret < 0) + return ret; prev = 0x200; for (j = sstart; j < send; j++) { @@ -314,7 +316,9 @@ static int decode_plane(UtvideoContext *c, int plane_no, c->bdsp.bswap_buf((uint32_t *) c->slice_bits, (uint32_t *)(src + slice_data_start + c->slices * 4), (slice_data_end - slice_data_start + 3) >> 2); - init_get_bits(&gb, c->slice_bits, slice_size * 8); + ret = init_get_bits8(&gb, c->slice_bits, slice_size); + if (ret < 0) + return ret; prev = 0x80; for (j = sstart; j < send; j++) {