From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id BE764446E4 for ; Wed, 21 Sep 2022 09:30:41 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9A8E268BB50; Wed, 21 Sep 2022 12:30:38 +0300 (EEST) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3162C68BB15 for ; Wed, 21 Sep 2022 12:30:30 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1663752636; x=1695288636; h=from:to:subject:date:message-id:references:in-reply-to: content-transfer-encoding:mime-version; bh=wdzbyGXXpJ5PtdrlUDPuxL8e9oGZDU9en/VQNvqqZzw=; b=Nkxh+PKjs0h5a67y4TUTrH75MVlDENM76DtGN/m9EOaTuLJUFCJrxjaa dGYSddiwqeYAqKuSXDA63WtOaFU1spio/XOQEORI7SJkU3rHq5BXMD+8M p/3aFVzN6+AKTzlH7aPRHhpWSOX0N7dvrH4FA8iC5qhjmKj6smchmjJew eT55fDgpJUmpJouXxQleZ3xq4ullr+JJe5MxXsB/XUcLyEcwI9sMPA6Py +q023V6MM4MVQn6KLd5mLFY3z2qanDR3rbl81rlF+xAIoAy1j2hZJFULz wj/fWiZ7GmklZXk4IjGMp/9gFa1ULpUnJQwOVp6MUOqQG2dDO5akctJkS w==; X-IronPort-AV: E=McAfee;i="6500,9779,10476"; a="300790984" X-IronPort-AV: E=Sophos;i="5.93,333,1654585200"; d="scan'208";a="300790984" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Sep 2022 02:30:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,333,1654585200"; d="scan'208";a="652460896" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by orsmga001.jf.intel.com with ESMTP; 21 Sep 2022 02:30:29 -0700 Received: from fmsmsx608.amr.corp.intel.com (10.18.126.88) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Wed, 21 Sep 2022 02:30:28 -0700 Received: from fmsmsx611.amr.corp.intel.com (10.18.126.91) by fmsmsx608.amr.corp.intel.com (10.18.126.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Wed, 21 Sep 2022 02:30:28 -0700 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx611.amr.corp.intel.com (10.18.126.91) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31 via Frontend Transport; Wed, 21 Sep 2022 02:30:28 -0700 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.104) by edgegateway.intel.com (192.55.55.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2375.31; Wed, 21 Sep 2022 02:30:28 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PBjmB+HcGSiofeOq7lpsbxgslQJKzvh4RJbwHg6f58q5vEkvmn7UeMUHk0nNpJTXBz1Sa0MokDA4RmSwW2y0p17xC08b4zPtpWTg/X9f0UlhqZq3MCDOG9N3Wj2QC/1cRSWkeZ4NHMLfRhGjXQFYRA/uwCF44tJdaL/1+nRptn7Pv07SJK5qsfuFrpjZZh7nkNCagVmi25oblu6cEMm0yIDopF7WnxBPddROvnL4YQtZd45rWWZ4xh6p2ytJJYZJC0/4sY1qs6VbMBb6Scs2M5MX8VfTz9mCckOzUbLS7UaSOOT4KNvClQZNTLoFtFT+u/vSCXas8FZjSFirDqe6sw== 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=WgASUoxZUtYXy8TXwagijwLvhwE2kP3eNCgh8qKDVRk=; b=F4JmzrbelYyeyZc0GVRcF1oE2aSz1znQ2IL08M9Ks3/zP9aifLLjNvmGc13KJ6DVl/JO0heT8NDQ7Un1WynXWbL28AXb1N4CzaGwJlk8iRasf/SAV29HQgC5Au0Owb88OrEonuIypXaWxPgb+rg6nqeTxusXRTZ2bYYLgbeN4R1WwbokR5zx8aLAmeu1G6hwdOO/eLg2u7V7oNTvWqh7NeOIIc330B6lPr8kuvFL2LFNiX3gxrX/fFxkJKvItHvy6vrb3HfXJRVtqLD/3ntZdo+XTjnEkw3+0Abu7FA/MH+qubC2l8zQ56CVdBuBZgjXMwRW+3zGsq9ZOIme3IOUOw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from IA1PR11MB6396.namprd11.prod.outlook.com (2603:10b6:208:3ab::10) by SA2PR11MB4988.namprd11.prod.outlook.com (2603:10b6:806:f8::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.16; Wed, 21 Sep 2022 09:30:26 +0000 Received: from IA1PR11MB6396.namprd11.prod.outlook.com ([fe80::e4be:d3c5:44a9:4e02]) by IA1PR11MB6396.namprd11.prod.outlook.com ([fe80::e4be:d3c5:44a9:4e02%5]) with mapi id 15.20.5654.016; Wed, 21 Sep 2022 09:30:21 +0000 From: "Chen, Wenbin" To: FFmpeg development discussions and patches Thread-Topic: [FFmpeg-devel] [PATCH v3] libavcodec/cbs_av1: Add size check before parse obu Thread-Index: AQHYseSL44eUOgmBMEen287nCfs2Ea3pxDCAgAAQ+hA= Date: Wed, 21 Sep 2022 09:30:20 +0000 Message-ID: References: <20220817025110.24169-1-wenbin.chen@intel.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.6.500.17 dlp-reaction: no-action authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: IA1PR11MB6396:EE_|SA2PR11MB4988:EE_ x-ms-office365-filtering-correlation-id: 2a5c5d5f-f027-4210-e79a-08da9bb3e758 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: Pb22+36MFj0mHsFuW1BIOOy211Z0BrIZSGvaqmjl85A59RlfubUSZHIG0UhObTDFcTR4s47IP7Nkiig9ZW1ViEu9dJGaPAnZydFyNgVXcHT3ZyOusVpiQUiXmSnJHwMGQgaEhS+SRaOkkabQ9Y2/YeitS/7FQNW2D9XrB0kXPvyfxyEJu2SOC6bz/PNMuYX0dtOzBZ+VKyaujyUc2Dz80FwF/AVw6jTD5vGSLOUDM/qp6dtbRnWwptjM/7kxGSuuQlMJlKtJGZOXDK3yiaZ0u6/zJ40tRVA9Gy9K32HHJcnRtA23PjAPEXhbKMdijWhuTcKDZNMoZvbiiucBTVfu2/XPMcvA41DOWmGS5/Kau1JGcBde3zDmaRoT2LSarNAFRcJ4mgNkuNBpchnEvhC1a67j2na9jV2xTo3dNFQMFXvCXPQx1+S80P4tRsfL2vqWFCitjoKnqC3cjk8qWi/oga+O5S2FLo5cKioI1gpCHk79dsEW4WmeLRljGOdPefWx+4Sw1YtPS882qfxSeLHyJEHQEFbEerTULUe3Xrp/qtRF5GJH8IZkdkVGNubS7hPRqXHxGEfIa9moeeuSefFjIJ60QquS8FHdAf/SLqJUd1htAgyr/Ngfag65/lOGGKc2wlz2NZngCIjOJiXBIRcpkSsMeUDgNlu2sUqnhaSZND5/aJuvn7Dpfm5GuavfWbzJReegsz1HRxaEYY5YKfcIkHZy5h93EZXb9JnK8hCtgekwbPbF6vQ6AhXiyyQdUq3HBnBSrGv77Nd+e5+N7Z+/Yp+wM7iO2/zScWxVjSbi+pY= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:IA1PR11MB6396.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(376002)(396003)(39860400002)(346002)(366004)(136003)(451199015)(7696005)(26005)(6506007)(9686003)(71200400001)(478600001)(6916009)(966005)(41300700001)(55016003)(33656002)(316002)(122000001)(38100700002)(82960400001)(86362001)(38070700005)(186003)(83380400001)(19627235002)(52536014)(5660300002)(2906002)(76116006)(8676002)(66446008)(64756008)(66556008)(66476007)(66946007)(8936002); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?yYMRj7lzAP+RZdCA98JMTYJ5wI0Jbj5+ypodIVOu61WzB/62khfl0dR/ytIv?= =?us-ascii?Q?kR+aO3/R/wH8ZNEXWrBLIDjNs3QMcWuCLu21/VLfghHY83Y/OCOwk2gxQu3r?= =?us-ascii?Q?N9HuGGhx4E9SmdgMzKFDjn3qBnAuuMHAjgMl1auI4u2otFsmUD6QchTvnBn7?= =?us-ascii?Q?XtFGfZOMOKpJPgd+/i8CKoNOpnkF0vsMdXzrededTJlqOirOvVWddY8msIH+?= =?us-ascii?Q?0CMavCSirsNKozo5tyD60a55AnHBSCD4pw9JK1GWaC4S7Gp4XgLK5zotVU47?= =?us-ascii?Q?MgzkX+W9+FL7JovwYulJq8rI/YCf01EXEakJiABvdg+RzSz1tafgcoRBDPP5?= =?us-ascii?Q?S1F2wFanAaaUXvNkwp7EJ0042KczzdWgE1Dsm9uMAEeiBe4unzuqQSKsvb9C?= =?us-ascii?Q?7VepnLXlSk2DycFnUCK7TjyYDjf7lE/JlgnhiGq0LQxjIruVYlHcGyt5sOc2?= =?us-ascii?Q?VUJSuVeC037z2hsjI0JRoLKgBp/skj2afXFgjjueY12fdPYwyYkfkc0c2y4U?= =?us-ascii?Q?VWiHvLK2AGoFwc2SPXfXCV5FM0nlUwGlWJ5GLEahtx/EyCIkhMaRgRxEsc/n?= =?us-ascii?Q?hLSmEsX8QniJPj3Nv3A6Cq16H8xC8onX8BXEXhYl4EhDlaB7y9V+aO1VLPKA?= =?us-ascii?Q?qpHvbkqlgkr1ro7aX8uQXGaLe42dMOnaLC0mcvHIZOL7d1gmQ6FKoGWrr0js?= =?us-ascii?Q?xqdShG4X86j3anijSPz4BkWWsCjC5VQhX3VWocnyF/7TG9KuftAXPe7bvlEj?= =?us-ascii?Q?ySUqEucTUWG5Zbmi9T1W/3Lxgzb0n5ZJHzYthyiRVfONcwrm9fJMXApFOHvO?= =?us-ascii?Q?Y1gTJO85fIRh5vTPAXI/6UT6jEaP1fJECiyLwpx+4n0sCtskW03O0IsC6SV6?= =?us-ascii?Q?Ip3UDf699dDnkyDZQuKsMdt/U7y+sfo6zSlXgxmOOSfV4dunGYgUt1M/+KO8?= =?us-ascii?Q?tls/dUnGiAeaEu21G8DXgJB1P7MI8XfQgRy11IIqoJjZRu9nV2No6hVPhaLu?= =?us-ascii?Q?NxlVYZKlOqzTSn2S3AUHv5qvAfcUarHVYJbs3OlBmcRwW3KSjnSYJBERzn/f?= =?us-ascii?Q?CxG4+FdPnEagsbvNErM7jSUeyLPhkEBZehJpzMWI8Cs5J/vG+CyhCHVT+ta/?= =?us-ascii?Q?rTw7yPRdwRB7LIREYy9VQktx4W7Dnj1N31vqlQTnjB2IUCxJBjvpokNA9TPM?= =?us-ascii?Q?/PLma5hXO1cYkhV2psCLYQSCA76dAgqKgSwdqTYWPKpWSCQQ3wqNHbwbOM8L?= =?us-ascii?Q?ldHdwIZIAopqyjUZloza0u9y3aS/RzZrir4j42uMtd7ZmqK5VHAni4EmkejI?= =?us-ascii?Q?sy6SgIVjksXhrLPu9PCeU0eVh3zI2UGNEIGkYPro9UmyfV+tQA5d9EQmH7mw?= =?us-ascii?Q?j42eOxVwkT3Uinqu347WYmBLs2NocirpfKyE93xEcsc+lOzcSHWrnCsHy5aw?= =?us-ascii?Q?aqw35m7/bIonkswaXKIbZGg1LfZJHsB5DkZ2A+ZRG6uNO05BQVPpw1ks2oAH?= =?us-ascii?Q?yVFx61pkLAeFAMkDDi+VPwmzh79ae31BFVaT5+NaDqFTngeeGtW28seV2SxN?= =?us-ascii?Q?pbtUPmmbDdFmXu+z8Ag9Wpt+daxXlX9mL8WQYDyh?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: IA1PR11MB6396.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2a5c5d5f-f027-4210-e79a-08da9bb3e758 X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Sep 2022 09:30:20.8848 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 7IiMAyKtUR9PV0S560mhu2RpA2X9CIe3njlFxI5yqUiTYV1vWCt/Lj6pAYw1OoQkG9Fjdje8XVd6Cyp/isn2KQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA2PR11MB4988 X-OriginatorOrg: intel.com Subject: Re: [FFmpeg-devel] [PATCH v3] libavcodec/cbs_av1: Add size check before parse obu 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: > > cbs_av1_write_unit() check pbc size after parsing obu frame, and return > > It is cbs_av1_write_obu(), not cbs_av1_write_unit(), right ? > > Thanks > Haihao > Sorry, it is typo. cbs_av1_write_obu is assigned to write_unit function pointer. I will fix it and resubmit patch. Thanks Wenbin > > > AVERROR(ENOSPC) if pbc is small. pbc will be reallocated and this obu > > frame will be parsed again, but this may cause error because > > CodedBitstreamAV1Context has already been updated, for example > > ref_order_hint is updated and will not match the same obu frame. Now > size > > check is added before parsing obu frame to avoid this error. > > > > Signed-off-by: Wenbin Chen > > --- > > libavcodec/cbs_av1.c | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/libavcodec/cbs_av1.c b/libavcodec/cbs_av1.c > > index 154d9156cf..9c51a8c7c8 100644 > > --- a/libavcodec/cbs_av1.c > > +++ b/libavcodec/cbs_av1.c > > @@ -1075,6 +1075,9 @@ static int > cbs_av1_write_obu(CodedBitstreamContext *ctx, > > put_bits32(pbc, 0); > > } > > > > + if (8 * (unit->data_size + obu->obu_size) > put_bits_left(pbc)) > > + return AVERROR(ENOSPC); > > + > > td = NULL; > > start_pos = put_bits_count(pbc); > > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".