From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
	by master.gitmailbox.com (Postfix) with ESMTP id 99D2B4037D
	for <ffmpegdev@gitmailbox.com>; Fri, 20 May 2022 07:18:05 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
	by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6D50268B477;
	Fri, 20 May 2022 10:18:03 +0300 (EEST)
Received: from EUR05-AM6-obe.outbound.protection.outlook.com
 (mail-am6eur05olkn2028.outbound.protection.outlook.com [40.92.91.28])
 by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D258168B1CD
 for <ffmpeg-devel@ffmpeg.org>; Fri, 20 May 2022 10:17:56 +0300 (EEST)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
 b=kp/PG5e1CPz49QUqOYDYYdFNZYLi77CusyD8yLgHHwdC9ogKW5v+hOFPYRoA9t4LxkQBtqMLwrtY3wWS4+SNS/g5Sej4elCaA78bLh1//tu9VLb+xnr7al5hVrjRbnMN7oxcejZkcGYrQLkCC6hVl1CgMbBNg8bX1YlJzL/qlhgdc7BafGyG42tiDfFP8ARx6LKS0r4fniXiQON6dNDlNmnRZejUyHSsrMpsFLnqrKqvkTqjpVaHmwjALC3u7JvBY5d45DPNsgNK66iafLx1pGMqjt362jTXzF3otqYBwCy3fMnMBhh0NRA7tEW4KFEcml12iFNNHpfpCzcvRvqS9g==
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=b8nyYDUGWrC5b1Ml2+HD+H43FzneoObrq7J+DIQ8Il8=;
 b=RmQVZwzYQbrdZI7D3mSv8noregIX4eSJQPk+jaJQCbTKRjnnNeFneNItV+drw77XFcYEkaRlkHdIqiWn4afuEs03ATgH+aK9xm50nkO/Oue0Gf6yBp0JCFIuHS1bbW3scBBQhmT5i5A7z0OE1AQlUmXBazhJCCtGzNC6Qt2m+e60YLz8K3ZKoqHyv0E1KKu7YByOkc+aGb9tyqZdL5LZv6N0pdlim9lWI9sw2DX3H0AE3e7pqoXa6bQl9+dBoYOEEwkupvLXagQuUGNe0NNZcqq7kS/hGjbf8NcNMZ0IosVv6xjm2Cdhvij14xXkMgUyaieVDApJYlDUaadCjmpIOQ==
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=b8nyYDUGWrC5b1Ml2+HD+H43FzneoObrq7J+DIQ8Il8=;
 b=G7Pym7LWxReQdK/oHvLdceKPxYeWRl+g6bsgJ35ih0wlNoEkb+FjMdbJ5Uuzm9woTpa0vRRJH2gnNPcI5QVjZj5e6RVxpCmamQqSq84rYanWDxrvFPJ8T1QS7Mhm2yI7BHpIj7LIF+hzH33mE2WhqRLfHoXMbF+A62MtakdIXHy7WsPvizC/ccm5LTXdDlwoyJ+q3XXjAKlpIKwAPpa5rLBBIpA1y8o6/BjAYRTPh/BK+QPC39XnTYF/MM707XtI60zbea042nBKnx5XeidAd70Bcx+knkcheK8i1kPGc5Y1X7z0ZJt0k23GJhIhEA4irYlvJBxJ6KZTRAwtxJ7gbw==
Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com
 (2603:10a6:4:42::27) by PR3PR01MB6394.eurprd01.prod.exchangelabs.com
 (2603:10a6:102:3d::14) with Microsoft SMTP Server (version=TLS1_2,
 cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.14; Fri, 20 May
 2022 07:17:53 +0000
Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com
 ([fe80::60b9:9f29:40cc:f01c]) by
 DB6PR0101MB2214.eurprd01.prod.exchangelabs.com
 ([fe80::60b9:9f29:40cc:f01c%10]) with mapi id 15.20.5250.020; Fri, 20 May
 2022 07:17:53 +0000
Message-ID: <DB6PR0101MB2214F438F381768D0C656F0B8FD39@DB6PR0101MB2214.eurprd01.prod.exchangelabs.com>
Date: Fri, 20 May 2022 09:17:50 +0200
Content-Language: en-US
To: ffmpeg-devel@ffmpeg.org
References: <20220519234312.11733-1-michael@niedermayer.cc>
From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
In-Reply-To: <20220519234312.11733-1-michael@niedermayer.cc>
X-TMN: [EWilW7nrVfb/r5tSnPzYotsXCpca34G/]
X-ClientProxiedBy: ZR0P278CA0138.CHEP278.PROD.OUTLOOK.COM
 (2603:10a6:910:40::17) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com
 (2603:10a6:4:42::27)
X-Microsoft-Original-Message-ID: <5f4b8cb7-7b6e-aee3-0b1b-fc99abd294fc@outlook.com>
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 1c6f326b-cfc4-424d-4713-08da3a30daba
X-MS-TrafficTypeDiagnostic: PR3PR01MB6394:EE_
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: PNIl7J8DkjROc0TAsrwnELcG1q4pzy4G2mw4eI0zwfNtSPem4EC53cNEfEBJ53CkXd2wzEt3szTrnxr/MfBLFGEJdZp/tLVozRdda8Hh3ptvrsxQkAsxJ78i4JKtYikUJPDIjQMT7s5oP1H2y8IwpwZiEci5e795wC8emXHs924/e207ATxM8e2QmIzQ9CsSdFwKdNJVHYvQjt14sfjrsbF4hm/HnQJtHBDuzsi0M0pT9Ppor3cHgNcLr5spw88teVYjnvWxeIKMKSLIsv95ltlvF5tXwf0HzWyf6qBvHXFYrMOHKXWLHMnog5j+0plASJxsLWBcWvxr5uOMOUEm9UilptIYSSMZt2t+PlA/t7PjHLKktFkDcTeA2rwHYX8VxdCcT4OBpNG4Uuzp6aJLraNykAlyiHemjsjNk+IsQxYAThf5SRVy16Wl7vzROYYO5zJcUo1R7PQWqqQiUcJ9zY8gTvMaroFht47L+UzGy6PSh49sKKuUmEpBXlTaeOSC3QcQUIoov9FEASBBHrcLKgl7fDv/+6X1zjTSZnXfvRR04uMmX/Fwa8tpoatgIscYcZ4Fw+oWM7DPa3fw+Hr4eQ==
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?U3FBYXE4Ti9ObnRaRWRkb1JWUUhJWGlHZ3ZVY1NNc2hXeFVlUncxOE83SDlm?=
 =?utf-8?B?b3J1dHQvSTRuTmFVaTV0aDg0V1VycFlnVENwc0dRbXlTTzlqNlh3elptZFhn?=
 =?utf-8?B?Z0ZvcU1JVS9OTlN4R2Z5L3d0N245TnNsaU82aUJRZUdpUlVGeUNJYWtqVTJz?=
 =?utf-8?B?MzU2MW9ySTRPbklEKzVjOTZHZlcxSmdPVW9ROFUyUm1NWHBXS2RRcUVVTEdI?=
 =?utf-8?B?TEhsV2VQZHREVFk3OW12dWM1RWQzWWR2SDNoRW0xQWhrSGN5QllqNkRkTXR1?=
 =?utf-8?B?WVR5bkxkVEdJNzdzeXdnQnFZblNtejhqSFdNSFJPVzJhZUFRWVlFbzVoZXVk?=
 =?utf-8?B?cWVGQytlWDJ3V0Irek0xWTN2ekNUOXhsZlNyV2RjNUVPMkZjbC9lRy8yc3Bq?=
 =?utf-8?B?cURReTlrblMwNXhiblVQZXNPZFMzdTdPSVZ4WFBYVUZYWVF5dHRid0lGMEZV?=
 =?utf-8?B?REc4R2xRTlpzRGRvcFFTMEwxZ0dlOSs3SnVKWThVVk5wRkdrVWQ4WmVRRjI1?=
 =?utf-8?B?UHl6ZEdqUXpNY3V1RC9OZGtxUmZSVUVNRW5aTHJ3TkJVVVJYY0tQV2FGUnht?=
 =?utf-8?B?Um5ocVlKU05sT2lCYTM5ODBMOFVOcUw5MVJDa2Jyc0lzc3gwd0dOU3RPRFpT?=
 =?utf-8?B?aUJFVGM2VjFaTEp0ZFc0SzFCeG1pU21ySHRLSTJ5anRpRTNLOVowL0tmVFY1?=
 =?utf-8?B?SHhuaU5BTTBUQXp3RUt2VjNOM0IyM2thUG9mYjEybnZTd3UzbVVoaHNQY29D?=
 =?utf-8?B?a0lHMG0yL2pIcEhhVEZGZXN4SFU0Y0tqZHFmakRNMzU1amlnWklFRmhxY2tq?=
 =?utf-8?B?NnpWY1gzMnN5KzVlYXRQZ0ZEZ0FyWGIzYStsZTM5Z3hFbkRLWEZhTXlDMnNX?=
 =?utf-8?B?ZDB0djVQTGVrQ2hqQ3o1QVY0WnRDYWdJeDU5bzJiMTQ0WEwwaVRLMTIrbW1G?=
 =?utf-8?B?dmNnSVB4dXRLYWdBMzVzcUZ2b1lYQmhkdEtuUENWMStjalh0VmNMcjZET0FQ?=
 =?utf-8?B?MkNKOGhWVG5DRnYzZnJkaUpNbVJuUy9Pc2JMWC8ydGhPMTYxR3hncTFxN1o4?=
 =?utf-8?B?eXpkYTZQU1pweWtWVG1GZmVhMlBOa0l6L1c2cnFmZlAvZ25LcW5MYnNwTE1O?=
 =?utf-8?B?QXBQaGRqM09SdktMM0x3TGQxb3ZYdjBCaERQeWJaQkk2TGp0UDVTQW0yZlN1?=
 =?utf-8?B?NTZXcmplS3JNVlcxaW8xckg5enNGMUdVSHlwK0dwd2JCMkloVDZ5MW9qUGpC?=
 =?utf-8?B?TTZIMStmMnZFbWcvaWJHa1dWYkFNeHVEL0hnbUFpaVZsdjhKS1hDV2pScSth?=
 =?utf-8?B?czF4Y3I3Y3Y5N1lFNjN2QjhWcHQvUGNXTzdCTU1UdHU4YVZxdEdlMlVWVVZV?=
 =?utf-8?B?QjM1Qk1pZzg5L29UdXBiZTU4MnR1N2Z2WlRDUkE5c0hHdkRHM3hCeVU3bi9x?=
 =?utf-8?B?Vi80eDNxSFVwUnpNNXA2RXNpejdTWklFNFNxSG1WUmJLVHl5am1selF6S3lw?=
 =?utf-8?B?MlJEbzFuL1A0MWtUOTFaeStuejJ4TWpwT0NjdXJyL0Y0eWpJSk9QWjNZcEw3?=
 =?utf-8?B?RzlKaDVwZWIrYTRLdytSRkoyVXo5RU9uNkk3MlA3MThwMUF6UkhjbDR3L1hG?=
 =?utf-8?B?Z2EySk9ReWJ0cTQyQ0ErelpiQjVvdmRMV29rMTc5N2VPeEdManFMZldvTFpn?=
 =?utf-8?B?UjRseng2cC9CdHd4RDRnUG5ZUExtRFhKSHdMeWV3dGFmdlltMXM4NVRya0cz?=
 =?utf-8?B?WjJlQ3djcjZUT09WSVJYL0N6VWFERndJQVNXeGcrOC9aWDdPS0xNTHNSd0No?=
 =?utf-8?B?QkY4ZUV1Nit3SU9Wb09ZZFVncjBsdjRUeW1ubExoMVlLV29uclY5NWV0TEhs?=
 =?utf-8?B?Y0k0NzV4bkQ5dHBJM1h4Y3huc1JTWTJ2YzJZYmxsN3NwSjJrSTlrRWxkb3Zs?=
 =?utf-8?B?bGZkdnFSSlNMMzR6TURVY1FNc3JHbUhneTNhRzh1c1AxbEFXOEZ6cFJhVTJF?=
 =?utf-8?B?NTdsRWlVaVBRPT0=?=
X-OriginatorOrg: outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 1c6f326b-cfc4-424d-4713-08da3a30daba
X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 May 2022 07:17:53.3359 (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: PR3PR01MB6394
Subject: Re: [FFmpeg-devel] [PATCH 1/2] avformat/matroskadec: assert non
 NULL buf
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
 <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
 <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/DB6PR0101MB2214F438F381768D0C656F0B8FD39@DB6PR0101MB2214.eurprd01.prod.exchangelabs.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>

Michael Niedermayer:
> The code is only called if size is > 0 so buf should not be NULL
> 
> Helps: CID610554
> 
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavformat/matroskadec.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
> index 4715f1b7d4..de73f97aca 100644
> --- a/libavformat/matroskadec.c
> +++ b/libavformat/matroskadec.c
> @@ -3701,6 +3701,8 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, AVBufferRef *buf
>      uint64_t num;
>      int trust_default_duration;
>  
> +    av_assert1(buf);
> +
>      ffio_init_context(&pb, data, size, 0, NULL, NULL, NULL, NULL);
>  
>      if ((n = ebml_read_num(matroska, &pb.pub, 8, &num, 1)) < 0)

Ok.

- Andreas
_______________________________________________
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".