From patchwork Fri Apr 2 15:39:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26714 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 59C1744B07A for ; Fri, 2 Apr 2021 18:40:09 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4248968A17B; Fri, 2 Apr 2021 18:40:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067074.outbound.protection.outlook.com [40.92.67.74]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EBACD689E05 for ; Fri, 2 Apr 2021 18:40:02 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LEzklPrtq9R/E0O2pUaXd5Kfr0HaZm2DeXdkqvjEraPr485g+Wmuld0RIffuKO17MhS35dClRPkjOLkcfml3mGdk3zcFLv6e5fSxFj0p39KSN9HAD6cfcTSzQbWWmQ+oQ+PXjvxrZ3hhHCT9lEUYSpxq/d6oHK4Maq+fYztz7963wG64UAjxZQr8IcqNVoQskC9u3p5lR0h4aTIqAsYaDbGF3hz9T6Ih5os9DZzJ0mLC+eOvA+6lGgFqZ/v91w+e+YdgONaE4wfLDUkPBPcfQg+f2kcS+jyiOk/XKzLAhIh2miyB35VOvtRYsFJ0rBr3pEUa0wHGnQlmSbWV3j+OdQ== 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=J9OnScH5naizsJ/e3Zq2qvoyw0KwRBOSeZrq1WgEetQ=; b=IigSUK2G/DJXfBynSZVtO4/uT59S76DnFIV9sVMwhkxa0QjrnL9/GqqG4pq1sZSf3Wl+vZfPKEuwfzR1HE6/njSqJUTazpv+lIgMuXKis4U6cOOjQfDVHF1WoZtCq3HppFHIKgIXfaRLJkEjM45y8+kZIFpVUG377QwifqUD19jU7PFBimLzeAwgknX+9rMOBYAz80VtsUYafyNSIu/kvrH3VGFgaR3L5hJMe3vuup4A0n72UEhQF6PIQSQhcDkAtNnCfAp8xz8UsS7saIS9NbZuX3niPlYBor9gt3sijUOUEsYSp1EMjQdJcerwmHtpbhpbBp0cwqiEG44uS1ARbg== 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=J9OnScH5naizsJ/e3Zq2qvoyw0KwRBOSeZrq1WgEetQ=; b=mLFODAfvdr59t5GavBkQJGyKUztd2FcB+sTryj+fLwH+FHnzDxjZY4CaemgkcfQL9EOmlS9TIz6/Pg4/CbJfc2dhLsPMw8SVZY8lzac/F1bp+hbHJiIzqxJ9d4ptfLzNIVya0oR/hcbJevtVVX6/xalVPYV1mFk6dAO7Vf26PIDMOMctAgQWNlcVo5pep/4CZJV1EOk+HdVqr7rwQFV5abe5nvO49DW0s1qyW+JKjOnTpH6D0ZjXfZ+uAFZvzanQQw9j5c8/zXAxuQQUnqiquudYFax1oVN5ciZtZqIpCifFl6ngawdwSXIZ3e7NcHY/u+x9Oczt+mpZVh/s/Cigkg== Received: from HE1EUR02FT060.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::52) by HE1EUR02HT219.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::353) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.28; Fri, 2 Apr 2021 15:40:01 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e1d::4c) by HE1EUR02FT060.mail.protection.outlook.com (2a01:111:e400:7e1d::464) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.28 via Frontend Transport; Fri, 2 Apr 2021 15:40:01 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:4950A6BF550668FD1B9E85DA0C30A0D3C3B8607A131FFFC4005262A4959D6826; UpperCasedChecksum:652F8983AC8AF0D078EF2456717A1E05DA82E2BA70A8F93F64D9DA11571E75AC; SizeAsReceived:7595; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::8128:5de5:4e94:9a21]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::8128:5de5:4e94:9a21%3]) with mapi id 15.20.3999.028; Fri, 2 Apr 2021 15:40:01 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 2 Apr 2021 17:39:53 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [NBw5JyIuAKqSNZTarFOn22/UqZ1gXPjn] X-ClientProxiedBy: ZR0P278CA0141.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:40::20) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210402153953.2742226-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.96) by ZR0P278CA0141.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:40::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.26 via Frontend Transport; Fri, 2 Apr 2021 15:40:01 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 70351762-42b5-4311-1504-08d8f5ed943c X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWm3GLoeUntTFXwUkburi0SfF8SXqQHfufplb1z7i0ukvJmsp+rBFCW2nnMZrdHMZzEnB6sF4Wik87BPJ9rZFgDabRFFPDXbeZlOKtzu3PHJE5NzpTtxWtFMgKI93NX7DXppah5v+WzfzCGq8wLxKqL/tIaNZ4HhjFb7fGeAaaoJXJkb73JZLcTz0AO4Bqn8dyDNoDWX+wlDFCmsUVZp4E+ywFpVH7kSGA9mFWKbLpLeQTSJ53s9PkaP4L3CBdygf8DXs8vSiyZuFm6Ibc7sIRhGVAjWkEpHravnBvaS2TexJtRE2p3TEzXT3DK3n1y9tw9yhK2DNxhd2QxxRUQYSJxuqZnPLczzb4jgib3F4ABKNHTubuajvP5RP84+LuNu9Pu6Y8dNSdcgQJVPMO/34muUC8YPnGxzlSBOqRWuOo+hp88zdPnNshyf92blEs5gi0ZUjnpksxy+wn6qYJvxp24WsPjN8SJ/3UoAxGwLnPdBFfr7sG92Lxo6HRq2nBZsDs3HBANyhdOhZi4sCdkhPn5W8oqF1i8iLek/rw2irtEknECgU/LN7CiEYVrDEgdEIhW70I3Ht3iBOVXRajWWcqJix8ncnSR/UDpYntRWwp9zZHR1t5jESeDQr77S6ahZeDGTM0PohTZNXQj2OHeI446FvezpRPBQYINCPLNv717IFygrObne+4qloTwjNlHQAMd4PlqvnPaBHe/Qrk8Kdgavq6spRoh0fg= X-MS-TrafficTypeDiagnostic: HE1EUR02HT219: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ETbPNbbL0WxkdXANwyVFonSO/qlwBNCjvDN/bWe7+rFavDdov9tPNvo/+dTM9ix/8N+A4BhLvi3gbr+j6mh4pufJlRYUwnggUWCiYoa03YpWuBuspk7vBmlUH3lGuD2F4U6nSBGqbURGo64dMXo21GXEi+Nw89sE0IoiQrZ+4tYXtBIhiYSI8dvxaaO5oJAPDIjrs28zYdUpjI+stur2RSXtEsl/DIIyfnQB74SXBqZr20GbWqpLI0C5x9TZZsNmUVFZq7ur8Y2NShtpE6U9bKyEYwu1MJct10kgdGHNJja4eXZEyT94AlP9hnY01UvZ8w/xiCBs+MF3x5UFcCmi+nwtr0WiwRAo6Ncno5eBNsZ4aDFVOClfq4CmErFNCiWDC+s0dENfnOQWcE8K05IGlg== X-MS-Exchange-AntiSpam-MessageData: aThj/PcvqNPHzvR/vfT/2XePd1KGf8YiMYAKRKeYCpO6qzlhNZmJ1jah3HnHZTAVU+Y8sw/dMgGZnABIYm9vGlvXuhrzeeCnQsOxs/rSPzjkK69ovW9ovqo65gXFVUCZbTHPDzcEnqEQ8aT+qogr+g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 70351762-42b5-4311-1504-08d8f5ed943c X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Apr 2021 15:40:01.8014 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: HE1EUR02FT060.eop-EUR02.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: HE1EUR02HT219 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/av1_metadata_bsf: Check for the existence of units X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" Fixes a crash with ISOBMFF extradata containing no OBUs. Signed-off-by: Andreas Rheinhardt --- libavcodec/av1_metadata_bsf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/av1_metadata_bsf.c b/libavcodec/av1_metadata_bsf.c index 8cafe461d1..328db5c0da 100644 --- a/libavcodec/av1_metadata_bsf.c +++ b/libavcodec/av1_metadata_bsf.c @@ -120,7 +120,7 @@ static int av1_metadata_update_fragment(AVBSFContext *bsf, AVPacket *pkt, } // If a Temporal Delimiter is present, it must be the first OBU. - if (frag->units[0].type == AV1_OBU_TEMPORAL_DELIMITER) { + if (frag->nb_units && frag->units[0].type == AV1_OBU_TEMPORAL_DELIMITER) { if (ctx->td == BSF_ELEMENT_REMOVE) ff_cbs_delete_unit(frag, 0); } else if (pkt && ctx->td == BSF_ELEMENT_INSERT) {