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 8CD394B63B for ; Mon, 10 Jun 2024 14:18:42 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5FF1668D733; Mon, 10 Jun 2024 17:18:39 +0300 (EEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11olkn2040.outbound.protection.outlook.com [40.92.18.40]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9118A68D4ED for ; Mon, 10 Jun 2024 17:18:32 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eu8OKONPicVj7Nj19X33hyWRwPY5LzhA5YR/mArEjZrtsi55f/t8EF8rnDIKM2dUhT82jzCpzK9ZZI7cEaX9kEAb8z0NdV5nyXTo3qZdv/bUX9qH8DyhnmBM2WJ6E5beKvrOVgZLouPOlzUkHfgY9YcPkVw2AQ7pNudRQaoyeNkcGoynurbbQNz6cFrBirZsFFlt8kxFUtIXdWT57cOgMmOA8HGX+FgzG1LQZsnBcuLNxWWX+FK6+z6cym9N5DFf8fxysdHE0Bwizg8PkCIlOKC21iInxhAKWCtPkJiiEbdmGwLpovVPKHc3Kz0s8v/5VaZ7Q8DYqKPOAafjmN4lRw== 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=7VntUzPqGq18Wa4/q2jhw+OSDDLRDFdZanDzxkIKI1E=; b=MhEKr1FPUb9PmfO6KYLWJnsn4L1CckZWS9mRs8O8JbWodgXmAoe6dctsyukY/EBol2TJciU42q6Kc6Wv4lSAUDu4KI90kEdqsVb4ZMiU3DnYPQpxKePTXAILjdl+cyQYtJkDalW8MOJZJdtmeJW9vetTicgd+n3C0X4jqxUHDr0E1eSoAeI8YmpDDYlUNDe1wN7+e1GTkd4hxh28IqXjYBN1che4udDk34vJ4cBw6QXN2QpZA3p026ByUSUhpGtV7mpKzpJVxYokBixTW+/w4GFDnk51NujY7rMPR6jDBugeJHZSv8zRqYe+j+oluK07Xw7JdEB8xYf/etAEnsepxw== 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=7VntUzPqGq18Wa4/q2jhw+OSDDLRDFdZanDzxkIKI1E=; b=gGk5kSFo4T+f97KCOqxae/lC0Dyi0WYSPDo6oxEBZb8evsD4H13P6Kft11Sw2rX+HJx4fHlsSyEZa5zthE2r3wBRyPqCBRwdTy4TXbHbZXhg0cZ3dH4YLc6HSJQG+tjoz8xWVzIV6fq8jl1Yy4cC4k5Ak5v3uFgnyhzYrA8eZox16BDBdLr4TvD2i+wJsvyIZ8AnnJtAq+myYtLLUAVw9+duxnJu5iuGG2mo6Grzv5EkWJ/sY5DtHE0rFo3U5fzUIbQ8CrOC6p9V15Eolgs66k0t3Jgw8UUoF2sFFDD5HdhrFf7ZlQ0MQhXnFKaYzmFWnYWX1/SqArfj6e2WF88a6g== Received: from BYAPR03MB4168.namprd03.prod.outlook.com (2603:10b6:a03:78::23) by BY5PR03MB5218.namprd03.prod.outlook.com (2603:10b6:a03:223::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.36; Mon, 10 Jun 2024 14:18:28 +0000 Received: from BYAPR03MB4168.namprd03.prod.outlook.com ([fe80::b8b1:7fdc:95d4:238a]) by BYAPR03MB4168.namprd03.prod.outlook.com ([fe80::b8b1:7fdc:95d4:238a%6]) with mapi id 15.20.7633.036; Mon, 10 Jun 2024 14:18:28 +0000 From: Jiasheng Jiang To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Jun 2024 14:18:11 +0000 Message-ID: X-Mailer: git-send-email 2.25.1 X-TMN: [TJ1YYblh3RT2iWFjyFWtH8povtYLQyBe] X-ClientProxiedBy: CH0PR03CA0360.namprd03.prod.outlook.com (2603:10b6:610:11a::11) To BYAPR03MB4168.namprd03.prod.outlook.com (2603:10b6:a03:78::23) X-Microsoft-Original-Message-ID: <20240610141811.2895-1-jiashengjiangcool@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BYAPR03MB4168:EE_|BY5PR03MB5218:EE_ X-MS-Office365-Filtering-Correlation-Id: 610c7f4c-d875-4c5c-2663-08dc8958324c X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3420499023|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: 1Qzn8RL/j3E/YFQxVoOgTWA10dnm6NTUpk/PP+509Z9iBHtX57CAp4iVfLjbIZ7vZszToubYRQomtzg3PTfB0iV81gUz7zQuCK1JKhd0YqlogPI+snHY15holh55DG/voYGw5bRA814mTEgZfnIzZPUyodK7/YC5YgsLZePWfBppgt7+8sC0nOuzVelgTNWvvW4kaLc1d1VLBBgP1CCGSwsVbGYO1nsHgv5qCaBwyPB36ivjGQa/FZ537smSYhqDdRmFd4DerMpR3nHcUC2gRA8DHAP2Bs4xm2c8zplyMFUmwX2moQ/64vnCrGs5sbCbR0eCyKE/UGKAdtgUO8yMlWfx9SNCyBy5vjBIB12w67lVqXSprPevepNlO+ccEMuyc0d50XkHzJ+XWMyQ+SVp3Tdj7wr4ZJCGw82dzjoqe6ykHc5QEC5PFpDJ5YuE1g2OMSo7FeqrojDpbVJNTk5n50K31/tSmixwqoy0PaxjiFcAkGe2KoHiKwGZyZF58pR72Irlt9ggA+l/f08TOACts6ZbuPp7r9p3dE1Oe9QsOr+KUxe6/SaK9SQOIir1TVDhPJHNU0fh10VeLrHLX5Z9k6Ad+MIn46RIlwWvLo7FQj6vGLwWzxsfRYF0RbjM2rPh X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?WSOr9P9clZHTQKY3gNs8r+0RzN4VNBnoInN4sv/LO1czLdM/HEyUCYp9C0Sz?= =?us-ascii?Q?U2Ovo8/a3E2P6/p0KqdH40pBgYh6xMXq+FluFD0tBO39b1aYVQQGWwuy0oae?= =?us-ascii?Q?SSHWpBnvXr0rUoVfAtZpmU8K4vkF7u0pa+x+7OeAyv9F+kaBKqMJgvAMeokl?= =?us-ascii?Q?N0MmaePqjvpZN+jbhF5V81nlMGfDwiwwr8iWLAReewB+z+LoLWwOsr4jT1sD?= =?us-ascii?Q?sXJg0oOlRm7txXqklMRg46dww6bJ9UPlv3kUqZOAeg1mu5LLzyXWRfmW8ky/?= =?us-ascii?Q?SX64rSAVp21zFsA0kysYmfEXVSMhkdeBd6PBO/8FCCGWQXdtCVf3eSlCQ1iq?= =?us-ascii?Q?Z2EJkSItW04+s++LNk+pzfO7DQ2AFwV094HCKa/QFp9T4ah6kH+F7rYexkQN?= =?us-ascii?Q?Q3y7xSpWaPwlkJ+rzw+JciWpePHh/F7ZmOujsirtzmvlV1f5t8yFNEnZ7LX4?= =?us-ascii?Q?yAhKfsWWIJxy1bxffh5xUDPNg0lhU9Ffl+nCzegkV/c4V0JFl17ibXQx3+OS?= =?us-ascii?Q?ZpcflIiFNNhIqi+V1Adr5kwKkcu6WCudlCWl80hK5ts2RCkv6njrglAJtEfJ?= =?us-ascii?Q?gYtoArBEjgN2C9iV3pvsZ7/ojKYwJTQz+eYumsgW0uoXidPp6j1v3QYAZ7jc?= =?us-ascii?Q?xMZYWHGQXsxFWCNtj6dm2Yzi4Uvz0mzEDr8FyQzcpppHwtU5BiKOOowvlN+B?= =?us-ascii?Q?yRGf6V2sLDS34bg6b0Rab6HXCZ41dbbUgDcMG+/ZVTxnk8qiSlfVxdLAQkjq?= =?us-ascii?Q?fSDxPMeMdTGPSZTgsb48NSUokgeYiv/j9k7+APvUPeWPzE7LPy2hPyFezUuk?= =?us-ascii?Q?ZWcYigPmAZbBGKotTn+YbjmtHvIBAKSCp+HEV0UPrV2PWL+NRoZ4hMpXSe4v?= =?us-ascii?Q?TqKpL6XyroMTP/BbBbuKuInlbS1KP6piMC9YbElarGHIK5YmrU8+/APQ4TFr?= =?us-ascii?Q?W2SJl8DhPw6FhU5sym4lQkXoTbqeD5OOZIcARmhxLrMabheHQc6XE5D2YqWy?= =?us-ascii?Q?QreO8/3p9awsPeAaQ12uRMr//agVG3CoYSLbJkgjEaRL5/TGFp3OSSyD9ile?= =?us-ascii?Q?KmNTfXVYu0oBJKE72hIDcX11aok0MlPlN09hcYp3ZqPLAwKhsIDnV42i2ydR?= =?us-ascii?Q?72xWDd8uyPffDXHuTBrU+97/BshgVxOLOq29RIiz/Zvx5UkY9S71+FRSUykK?= =?us-ascii?Q?qzzH26yJIL0Cgr8XqizA213tfeMLCWA3flpLnEqOkxOLhy/kFQJJEpiymfgQ?= =?us-ascii?Q?eCi2afwVmBoXh69MvhCt?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 610c7f4c-d875-4c5c-2663-08dc8958324c X-MS-Exchange-CrossTenant-AuthSource: BYAPR03MB4168.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2024 14:18:27.7236 (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: BY5PR03MB5218 Subject: [FFmpeg-devel] [PATCH v2] avcodec/mpegvideo_enc: Add check for av_packet_new_side_data() 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 Cc: Jiasheng Jiang 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: Add check for av_packet_new_side_data() to avoid null pointer dereference if allocation fails. Fixes: bdc1220eeb ("h263enc: Add an option for outputting info about MBs as side data") Signed-off-by: Jiasheng Jiang --- Changelog: v1 -> v2: Wrap lines in the body of the commit message. --- libavcodec/mpegvideo_enc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 82bab43e14..9b4a516bc0 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1786,6 +1786,8 @@ int ff_mpv_encode_picture(AVCodecContext *avctx, AVPacket *pkt, s->mb_info_ptr = av_packet_new_side_data(pkt, AV_PKT_DATA_H263_MB_INFO, s->mb_width*s->mb_height*12); + if (!s->mb_info_ptr) + return AVERROR(ENOMEM); s->prev_mb_info = s->last_mb_info = s->mb_info_size = 0; } -- 2.25.1 _______________________________________________ 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".