From patchwork Thu Jun 30 22:29:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36572 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp621429pzh; Thu, 30 Jun 2022 15:32:39 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sxI5HkUPbvmRx2SXdP0DGWc+QTq76fw24xyRMrYcicVNWaA8xrILVRbEmAaqOGBpAmxWwV X-Received: by 2002:a17:907:7603:b0:72a:4271:5cef with SMTP id jx3-20020a170907760300b0072a42715cefmr9115496ejc.454.1656628359109; Thu, 30 Jun 2022 15:32:39 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hz3-20020a1709072ce300b00718cd33f793si26863186ejc.158.2022.06.30.15.32.38; Thu, 30 Jun 2022 15:32:39 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=RVL9cKVE; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9E4BA68B825; Fri, 1 Jul 2022 01:30:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065087.outbound.protection.outlook.com [40.92.65.87]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3CDCE68B467 for ; Fri, 1 Jul 2022 01:30:56 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d1gJXXvJllRIcfAYzlYTNQSilB+34dQRcSQknbShn8k29iLkOxi2jFNWYXl5LNYWdl+Zs4eh9cTooKzuEGJ2V5oA1bb3GDm2R9rfRjf95v4dA8GpWm1yGQ9hmBLpbEg9T52nR+vhEk6oxl4D01qC3fPbdbMuR5oeFdY3o+RWnuagZaCwln0lJn+IOU2CQTiGSMtON+gBqEwgMHLYVtoR0lu/28APMCs+W6bD6tg7qUp+kLzr6PVUQp4Ps8JdOP7TG5NeoeXlEbqelbGLi7X9kI77S5IAKPeUAul7PlFpRz1EEi8/yfxN7g4IRpYlNeK0qKrRo+bc/MOAZS74n23fgA== 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=4mLo/Ikt134FfNLq/gb/WZRTqNdiss0O9EocMKcKUso=; b=NrTqXEFqt5qBlHpzXJeL3oWGqTWuZhvCVRUIyx8Z+r2PZK6cHkQwVWNHOS+2p52jnFEoP/ywWCBfseQqsGE2J8Fe5tFuGIL4X81I41hx9UVcP4rvpPKgXBy0jqZAsKYwmKd3TFydAwXU9VdIiMlPXqU4CsMjNC+UpG4xqCsNY8DVtjePAWxPNCBPn46TghyJFJAwGI1CBlWa6Fs5JMKCD8O1W3a7FkjRcwzD0exvBykiGHqgf2MkAmZrtqJjH3hox1ThQDH7gP5NUznOTmRSO8sTNAmeB/Xjq7W/5GEoW8A9ZJXIu4Q/5OlxEGVRxZ7u/H09ru8BYoil0AV6u4khVg== 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=4mLo/Ikt134FfNLq/gb/WZRTqNdiss0O9EocMKcKUso=; b=RVL9cKVEC+UXHy2JhqeiqcpxJSPMKPpNUk0LDFOLieGI21ylxpunFqWV8K7Q0F7K7K21avCDssNJsr/QagvvHNLoKCzxWIecvku8AUXMZAsUAKp2OzbrgPIA3JqRAfrkZMmKfsj9WyZxLuI/jk3viIJfLsVmtR8t1fw6/9P+QQ9K4KRiB8MgPYZqPO4OjdEbppB7rMEq1gfe4nq8NGXYzsUB4HHn2sokewVSeD7iEwpmKDDrYkaT7V1/ziineuBJnb4fOK9sXOj5mU1ubLSd9kO7aiI5YGHjKtaNvHNdZiVcQe3Nr+drK/JiYBSZh+81Da1oJZp6NrQa6jjfhbFunQ== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DB3PR0102MB3546.eurprd01.prod.exchangelabs.com (2603:10a6:8:d::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.15; Thu, 30 Jun 2022 22:30:55 +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.5373.018; Thu, 30 Jun 2022 22:30:55 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Jul 2022 00:29:46 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [o2Oq7D5RD9xu0EV73huPQUt/rVQykKxK] X-ClientProxiedBy: FR0P281CA0099.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a9::17) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220630222949.1758625-14-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b55111c0-d769-4761-2a1e-08da5ae8325e X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNXqMBxJfDcJWCkSlr5voV0a48K7zJ339QLXAxc5N5CdRQYGLw43t0VPidPHGoKNAjRwAsb60HuICh2/hBmNKG153J9yxI8lpuWsxqld5Kz1Va6dbaLTDqrb7RZHJpqDlJ9WvZh/BSu0v8EiBCLrsAim1ejxlNWMRvv6uJrubAYMG6VdI7420RJKi6+MMzZc4dyCJ1/KxaLYYMEicJrmpPMn7Eo4AqsZQXlflXeul4wbSSyqVCRc6ySAX/ydy45LJYSENeqcLPcnW95Gle/VQULtnA+jn8xmoKBd37UG4OCKAMv5qSlL7TWaWfVKVX7QCEh7TeevOEANIYmozAx2WOUXzEi6hi+U7yIyzCYacZkEOL4dknv4n9i/gMaoMUHr4mU6Pf1Y/EWfHIOU5g705XT91IjlaQ1ewXreBnR/PbPj3AxVXALzcc5lrCjeh4uWtgIkOjv1HF9KV29Nc7qi4FpbOMwhejci1cYqnPdc2woudEMzURmpVVffTpxGGjvzRHJoz54aLk370axAyIDX+fCkEtHx/ojVYxzjNYHxO/8e9wfXFtQcDBZc4a370qLX/IrfnNDAwRo/FqNzqmvUIhct+mVz7K1g9DYFWxpeD8ktM/UdbIyc5HWASgdAm23yDSxqgFKRcAyTpHPR7ayHpqpuPA6hfgYOj5Qj4GT5pxhkBkwYV4C6bz0N1SLyPB0kf3dkgEEeB6V8OEE4lm7fRl19U7ogPUpT2+M= X-MS-TrafficTypeDiagnostic: DB3PR0102MB3546:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: M8ySRRva8XokwrWCiyaQwNhHS1iq5YrQg4RMTVNYW0CA47Wy7xyY5pTuQfSktSbFei9o6PtAyjVIyMe3MRlOMEiz6T2MabWfIaE3o3b44y22MlccpEiDOmWqF9M3q245WNlBNIhpEWns8OP3uEDbYCVRqBANfToUanF5c7imJr+qZEaVS+JI/+J2fvvz4Na2upplQRf50o8dwSVrimfVBkqnjmlCc/2vtrmISV2HYbRf63q6qCDds73MdaBsBn5DJK5mfcbpFRJHUwU1ybVW7EtszxaFaqmixWA7t9pmfnlM1/o/DEIB3zYxIa1cTorQA8SuVMEdFB7XjHo3nQcIPnsNUdaxQ7+GEFGaa9hGNMp9zJE6lEpyCRxSECaf4NDsvhIAB7Ow3vLoUvWQy38Ytsq4hvIoqkzNrYbyq8aGFj5Z4XLvda9YfcwbIdVqKYQ0+RlsafTsWfEmGLWXpPbvEcNy0vAbXNUVCkJPb0STxx3zSmRxniOFoa8oxWJY4XzxkNTrV/XsxASeYIi1/EUIS4sqTj/1rEA/K2YcR0C7rGaN4zLO24NxQ2clnDE+gC3dbD5jD3ZxdS/MgoE2LnubwJmJMzaQB8qZMV7kGv6/3GV5kdFopwgaS6x8GOy4ymJbZ0mUegIDTtb8qV1t3pzy0AW7WumkM8Ex7ENAV22GLqnxzYWdEBMy9NdYQwl8DcnPROR+LTirBbLkM0IF12dFCA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: d3ef5SjZbRNqGyA7E9rNLzxh+lmO+P8mffsq/z2i/3rNfYrOyaTOt6yUyLFHGy9ff2tDVO70et3GhRd64EarXuBR34m+1Q2yJbGRFWIU+r6Lu/uTQCrUBkfbREivYGf3kHbwtYPqcY5fYrQLmnEqZxxGHB5aCCm0fTl/tR/EvQ37cFoEyHy0Sz5LK6+3wuv8R/qVb00Lb2M+T0uqnTo7ucddqF628Zkpzh2KohvNgryxa8qN6Daa24C10c7GuepbqHCmO6l8kafs6HNv0BZAzREgid+ArT3dZecuIFNVX76wpWqf6JFySE95De0ZzSbAEYw7jxOcgNzJVhe4hOD/TF/yAngDzYyzQmlCna2MWJz5kY2J4eostsmm0WJ6FHW9GeC8L5oPHv4xBO74L8HcxElty/wYCoTAOD2k5JJsnGaMNLT0AmO3EB4/X2Q7eTavvSYKXNxOKL5EMsl1XspDSXaPfJlWJjMG2rcIzB+3EQwcUbjVAhewEnWPiWbxqB8Wh2ybwB/d9GNshIzL5AStMzm26LNJAxSjJ1AuP7bl4qX35iPHEs2FyDg04FIPkrhxb1vHftC2xR7JAjbCQlMquvkgWoJ3kRZprcIokoYtdyCd0+y7N2osvTQ02HLiSSHDSh0644oR+1z8SxFX4I9Y+eCewMrZx/B7G7do3yZ92XBK7vkoSjwmO9AavqMl/9pTe2+v2GsBMlY8/jFNjPXwsIXkI3m2yHDtwoMrrMtWqIanYkXzuRZKv7PqEcaQjnpjyp6VojrMnRwcIeHzIeCZTVNBzk/dZt+4z7D68sbGqyWHq/7jh9CrmHL7+c/FZ1SNL6r3doyjoPJ0AEuB5X+Bdgrr+iweyTkC2mKIfaoL2SZpwLFXMpbVNW5wQWdNE9ybzqWDRg29l5lFyGkmb2ym3tYtdYy3eI8qwn/ZhmltGSclaV46zlKIoOCMvhanoR+H3lALy0CtvsaCqiEkIcv7luZhp4BTEm0Eab2mckpyth4pj4PimL/JCbBRVszJ8m4QPDPWC07/lztfrJGFigMc+4hxfMHmkXFWYaHgrT4TYblH59pq5xaxOBavuf9T870FHeMltRbm3AsfwDu+CkQEV346BUjYNDVlp8a7530SQQLa3E0BesyUERQneXPqWhI/O7JyUKs4AJMeEULBp76qSa+q99/E8cAgbVaXCh/BIL8aPlL88Ky5nPK1i2tEZlRZoALSVj3rJi/5cHA8sx+K2emfwwGaHZrpHFBV4tCe1K4byO6VQPUq4G2YCfRyuNeaTRSleYhI3SID7wqoBc2Yl6WNDvOgK8lWKG/JertTx4Y= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b55111c0-d769-4761-2a1e-08da5ae8325e X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2022 22:30:55.3415 (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: DB3PR0102MB3546 Subject: [FFmpeg-devel] [PATCH 15/18] avcodec/hevcdec: Check allocation 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: NuZqEHG6tJaM Also postpone it after the checks for invalid input. Signed-off-by: Andreas Rheinhardt --- libavcodec/hevcdec.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 048fcc76b4..5215f06e31 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -2645,8 +2645,6 @@ static int hls_slice_data_wpp(HEVCContext *s, const H2645NAL *nal) goto error; } - ff_alloc_entries(s->avctx, s->sh.num_entry_point_offsets + 1); - for (i = 1; i < s->threads_number; i++) { if (s->HEVClcList[i]) continue; @@ -2700,6 +2698,9 @@ static int hls_slice_data_wpp(HEVCContext *s, const H2645NAL *nal) } atomic_store(&s->wpp_err, 0); + res = ff_alloc_entries(s->avctx, s->sh.num_entry_point_offsets + 1); + if (res < 0) + goto error; ff_reset_entries(s->avctx); for (i = 0; i <= s->sh.num_entry_point_offsets; i++) {