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 AE5524291A for ; Tue, 6 Sep 2022 01:35:25 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8EB3D68BA12; Tue, 6 Sep 2022 04:35:24 +0300 (EEST) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ABA1368B556 for ; Tue, 6 Sep 2022 04:35:21 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1662428122; x=1693964122; h=from:to:subject:date:message-id:references:in-reply-to: content-transfer-encoding:mime-version; bh=6D7EAB2PUkHdgrB8bEtap9hW83JPKZYck+CUE+y916Y=; b=AjS4xZfZPG/Dm+FBgzkfF6i6nL8rjmxVCduhV5/nkJgRF5Q3mD4eqpgv 2fBV/oRDUEly0NB+ao8nXDimHWNIJJSLwGFQ3ZZ2a9V1gBM+Ewqt0kXnp Tl9/o8mBnuZa0kSu8JjyXbF4w9FLpYJbYt1/5nAl57HHmYo1ZWZYLX0tx TBpGRgOGa+jxCs4p+hrwdcTWc93I8yZsTmmNxJWo4My8G1ICdFRYm/gjh drRWisLQXj4fNwKNpmFi4AATEkcxhMB/oJ9UnpRiRysEhcFUsvRsfG0uT 4Jq6thk1urPXVOrT9bc2zhyGA4nCOrYhKbOjku0q/BfBKQH9nFpN9bJe7 w==; X-IronPort-AV: E=McAfee;i="6500,9779,10461"; a="276870436" X-IronPort-AV: E=Sophos;i="5.93,292,1654585200"; d="scan'208";a="276870436" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Sep 2022 18:35:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,292,1654585200"; d="scan'208";a="682217606" Received: from orsmsx602.amr.corp.intel.com ([10.22.229.15]) by fmsmga004.fm.intel.com with ESMTP; 05 Sep 2022 18:35:18 -0700 Received: from orsmsx609.amr.corp.intel.com (10.22.229.22) by ORSMSX602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 5 Sep 2022 18:35:18 -0700 Received: from orsmsx612.amr.corp.intel.com (10.22.229.25) by ORSMSX609.amr.corp.intel.com (10.22.229.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 5 Sep 2022 18:35:17 -0700 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx612.amr.corp.intel.com (10.22.229.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31 via Frontend Transport; Mon, 5 Sep 2022 18:35:17 -0700 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (104.47.59.173) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2375.31; Mon, 5 Sep 2022 18:35:17 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VGBMQzlZ0nMukZ9CfeRsTf4T6RWGFu7il5nOt3GdhqEKM9UCxrM3L4D11005VtejL1H6pezVR1Wl3uMDMKwAFD2Xug5qgZ+o5xZgX6S4Z6HXED89S6RR6EF7w3KmoZw8WmI/NyYZ1GJtPSkpv7zbiRGH9lKZhSoRINVCVR2gK6Zriq9+dXgxvpJDQCRuU76Z+VnGU59/dzMp2K9gc0k5HWEsKZ2na9TaBtZvXVAFs7iKhn15XfYteQURv6F2nwLCq6y5zLzlb7i9c9fpnKVTPjYxSEVMmUlM3MLUrmMZl219AjsbxYKYdcY9THL2fMKfXrH4tz4+AScx8ZT4IR+AQg== 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=ZzFzkib1MVvkt1OF59J9XL8A4Wg9uFVd4SwbxnieVSw=; b=hk7ItDU3GlCrTnWKj4oMneHS+zhCQe5XuG5sF6eVfLx56vIBtj8+OfV5+nCXRIoq4slI5xGFSwjqe6fgrsVQi++F1dQc/l7mSrYf6gZZLcWIRPOjERN4LkWQFDkM/4hgYNYeJtjaOetpRqcQR9FjkwnnyI70+VqaCWemWXWEPytwjweTnKAQnFH95AkfZf1yuGsYEjYJMrT8Z4X8AuGwru7ZL7Zf+A6jErz7Y51j3z7mnTRk5sPBPDFKAyW4VrLvWokVEaj/aH1UNQIC+ssD08FpRne0IzzS/wyHOFPdWE8xu9NXyJGatth6gT+2poqkNkLDP0vVABoUZRYJGIRvGQ== 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 DM6PR11MB4315.namprd11.prod.outlook.com (2603:10b6:5:201::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.10; Tue, 6 Sep 2022 01:35:15 +0000 Received: from IA1PR11MB6396.namprd11.prod.outlook.com ([fe80::d8a7:8d9f:3586:1d48]) by IA1PR11MB6396.namprd11.prod.outlook.com ([fe80::d8a7:8d9f:3586:1d48%5]) with mapi id 15.20.5588.014; Tue, 6 Sep 2022 01:35:15 +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: AQHYseSL44eUOgmBMEen287nCfs2Ea29jBBQgBQxsOA= Date: Tue, 6 Sep 2022 01:35:15 +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-office365-filtering-correlation-id: 2fcec5f3-41bf-43b7-c488-08da8fa80cb6 x-ms-traffictypediagnostic: DM6PR11MB4315:EE_ x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: RmEOe+14NVnNXQ2S/+KRb7GU+t7CoMdrjTcPSr8bBIaq/7lIrPVZt/3Uz0Fvp7FrrqVMqg5DPFRp9u9BpsXHr45Z38LAjRB5y+ViEqbyxkvCubs+f+0MwyRRKxrZ6h0e+rzf4C0hYOsraRoyGeynHhTzg9K9xrW4wjWlpjRVjFG1iMsRZxlmMCAXqTg11wwIW6uCgZXs3MLIrsdic+rcq+c2k4J+Ktgc1tWOyWE12YSUFrKRx1BMOdyU0pqFDAXxh5dc6aI8TVpLCAT1oANMpJSN7kLJQJUxzADRDh/St9VUzmR2jg5gXBEfdedx8YIZxO20nNADQvCpUFzDL4wkVVO/2k+jQ5sGbD7XSZhFXcKlWEOiJjd2eKcBk90pIiqOpskiSPB9yG+kpqv5LKWIIFno+qlGwIdvjiZ4YxsxTcFh8vkoBrfa0jmJqn+5QYQeUrw5+B/nHnGzHi7gaUAcAcz6Wq3PvdmdigMQ0sFVu16c8qAsjknxzNTW4kAClFLN7PvEnP4DiL//hlk+ff+vzRxAhK++1DbdAy3WfOrNRcXcNwR21/bX8YqX051TBqIlRcymvkRr74IYBZwrsoLvFwlIm0ZtQnl4L8SSwXZB3NE6hLAyBm3qRvRkkP7avo4S7JxoS38MMdEAfym1k1Cy4tmHoF0q1NAPqm5GVOMEdpWXl/S2I6mM+qbfMKu8RxPZK/BWmihLk92LpjiibaY50DxY5b2XZj+xjmNSdXbxI2KFWvgzisW9AzG8+mCwg17sreULYfLsLLjThshV/YuInOh3u01Qqde2BJZn2bS80Nk= 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:(13230016)(366004)(396003)(136003)(346002)(376002)(39860400002)(52536014)(66556008)(966005)(66476007)(2906002)(66946007)(316002)(19627235002)(478600001)(55016003)(66446008)(71200400001)(76116006)(6916009)(5660300002)(38070700005)(8936002)(64756008)(8676002)(82960400001)(83380400001)(33656002)(86362001)(38100700002)(6506007)(7696005)(122000001)(9686003)(26005)(41300700001)(186003); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?YWyKrmuW4EqPy+dPPXfClS1Yd66Kw3RLgjw2rYjKggqbnZH+k9lT1pLj36Aj?= =?us-ascii?Q?Z5tipt5ddF1V9Tfu3KIGSy4e4LcVVtZtmQGmo2FG1Cb3uinEyE3hTdymY+Gn?= =?us-ascii?Q?vnCBD/mbcfsTBBCYu1jDfDeUbgJOuLSrRIbKUPnFShM087UYvaWH95GtwEVj?= =?us-ascii?Q?OjM1kHbaAEj9SE1I+DIWq9pdtsPhexE5xuokUaDM0NtjhWnG+/1TdLWRyMJZ?= =?us-ascii?Q?AiScKptG9zkf+F8k4REG0EFUZ4jy8ZEEuw6yq8MKo46wExKFqINs1ZCGN9gL?= =?us-ascii?Q?NB3cxdvsMhbMCKb2UWR68JvFSG6f/ckU4fbhbZKOFjK266t7r75SzbpyJqrD?= =?us-ascii?Q?CgofBX3BzNsr3ofjdLwotRGQxSp5gHaS6x5CUZCICA+xz9k2a51vcDWtuUOY?= =?us-ascii?Q?UKJgp+gMzSu3n6o5u9228ysKSEPr1Ugw9SJs59PVgoCfae93CdEf4JX94dmB?= =?us-ascii?Q?0K26e3Ls0gfYE5ihnSaGS36NMMb+Xv0Eh3BFpFw45eX/vrC6klKZEkmQ1out?= =?us-ascii?Q?Y6gtCoMz5yi2sjK+x052TMRVJOWD1u/DqfB8bBK7oCmoV8UaqcMJ67KWV6NZ?= =?us-ascii?Q?VRHh8yhaA9cVrNrZP3OWbzpFvfIidFIWJbDddShKO7lnLbTja7ff4eqvZcWt?= =?us-ascii?Q?LLRTDHBDxyVm8ds2SLv0xN/olIvQuQSZji9KSKmBodkYqh+q8aTly1PyTYlu?= =?us-ascii?Q?D268VKtFqVLPt4xyLlqJHadd9SidaYcdHgY6sTu73M08xSqQtPYyGSR3X2Kf?= =?us-ascii?Q?5Etb7q9QDLo5YECotL/qsqjaWlXrA7kMObydQ2IootvJfTBxGaNvv9nQWkt2?= =?us-ascii?Q?hvaFzHGpVW2KwxQYFmIRExoHL5y3Qe9wGnHBXEEiwf2YHtX9GCEaWgCBUJPR?= =?us-ascii?Q?6WxdPeUQ1v0V2b9pvwCXewlVjrE7upYZv/5zCc286aj0CEID3QW999yKzy/T?= =?us-ascii?Q?NsVE0k+2fd8HXq6Y9A5X3UF+39nzVD9QKlNWmvSv9ihMzHKZ5BcHxYpTy6CZ?= =?us-ascii?Q?N4lauYceFv2Weq3ZfuCvPwm8960rVOBO4862B1dwm8PDGReW39O92QeZApVn?= =?us-ascii?Q?GPR4GIefZCiTuPxpJ1AgCyI6mtB8F9PETkWy06XXRBoyspWySnO8IEu0OovT?= =?us-ascii?Q?/9Au2wu7fNr53IwrjRf7BhAFyQD/yiulsS0+DoFqwTbqAwVw2LD5e6QSELMq?= =?us-ascii?Q?rXwTQzHaJf9Bc7CDi6afZCyqynMqS1M8LoqIirimT7LdFMpkJ1hcKeM7K4/U?= =?us-ascii?Q?oOExqLX6MBqNa/xmf32ChBipoPt7EiP8SfjhKyWtjDEoxl4XvjAoI215Ugze?= =?us-ascii?Q?aZWbhO7vKsbtTi9gmQQo0hQD+ct3nzOKTs50SeRf9hwkdJsOCfucDH9vyMoN?= =?us-ascii?Q?UF6aEC1eBNYbUamXMBHqwF+z+kVy3uW6HEMSr4e2pwHSSc+fIjQrijoKSvRD?= =?us-ascii?Q?IsbP9BR3meiHFoFTItjnHRW/9DKgpbJF1Nx117M5lg699MmF5ZRF8Tj/dGUR?= =?us-ascii?Q?0YOQdAxW8v5sW/Z/gHAA0st1nciUhAbl9WD82UtGi/CJca1B1O85NYAAGnjP?= =?us-ascii?Q?7q61GYzTWwnna3qRqqtut09bvjatU/nvk352nXWP?= 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: 2fcec5f3-41bf-43b7-c488-08da8fa80cb6 X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Sep 2022 01:35:15.6773 (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: XOJXyvAboScH/p8+FDrMTqVt7MV2HMdn0TPOOrxm/nOHX5aoZcmevIkZ0DgUb6nhbXqT/swjexQw2Ey67OSzqg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB4315 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 > > 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); > > > > -- > > 2.32.0 > > Ping Ping > > > > > _______________________________________________ > > 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". _______________________________________________ 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".