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 3AA6449199 for ; Mon, 5 Feb 2024 10:34:12 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D3D5A68D16E; Mon, 5 Feb 2024 12:34:09 +0200 (EET) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2052.outbound.protection.outlook.com [40.92.90.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 47F7F68BEC2 for ; Mon, 5 Feb 2024 12:34:04 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mQ0BDFfSqo2l0h0DS+Ap3a/Bc+zYHHkkOHbsgY1dVORzG/XSlEqJLWxnxwJUOuPcju5pK1fKG3AIMCV7ntDs5YPFKApzgmK/8dty9XxY3nuiZ01z1qv3dpoB1bxoxVT+zB8Jr5GuP70gSM99UxT+/vTwUGQQ7RZSTEUb/silSIYUjavDaLbcWFctUjlGEAZHbcHM2wjtsIW5Jr68ik0C5T5kdzJFRFHsULYD9GYnRD3AtnspdvZ6dG7UBRwBn8xMxCJTyWkl1VG2HuJNghJtml79iz0VtuS8V+kf48LhaUbdb/8iKxUs2/8EGJHMRvdE6xpFRzb4K0R7peK70kk01w== 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=L6PWSPqTUlGVO9U0IZaVPlNB0TJPldBu4DYTrfa7USc=; b=mEzn0RJNBfvavX258+tFGd2YbfQEyqgwDFZbcrfuf0RtDRKyOzZ/QgUFhA1uTHwne4D1JYsY8/Rpw8Oe3UWX5VR+tIgXWt0qByWe9kzk56SBkQ7eK6//Bqo/MufFiXHJe/0hC0bSs2Qxw3ufDf5aiPTl0SxDB1Rjvm/eF07xI/gTH5Gh2YdNOnIJktvwfRTXVqcQ8iTbMdE4CAyxF+AwwJngk+l4wP5qRiH1hJIafYvAZMi2cDydZYq4ep0IPsGQHVuy2c42DX1Jld/wDzWgFAnrvCv3uflHhl5XYnqudBv1obZf5xGHiSZYYmopHZVvOf8R8yJiTqLiqd0VD9ygYg== 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=L6PWSPqTUlGVO9U0IZaVPlNB0TJPldBu4DYTrfa7USc=; b=UvU5357l0vXpjfm7fF8J/gbth+ljrBFVzT/fzLT0AozPnl21YR8x6Bcu2vwXUubTn3VtgzDw4kJJOO4jgeyVaDPDRFhtCya0tmbZ7NOqFefIcSdJxeioT7DTS1QHfYE2nItjREgjDSJKkvil6q41MuSODMOYGplgXtZKfHogruPAySwnN/Bi+EnAipYb0q3smOpQaFC9MVA9tJzR/kRifDgW8SReon8ynnTfLggw3SMZljh2jAuzkjAprGXsSO1g9kdIfzqr30YMEEAV1tfaEKefs/IT+ETw+g4PWq61NEsmdvtbR48qMibHu9gyw80oQs+6p9sk0CH/UkUI1CFoaw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0080.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:271::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.34; Mon, 5 Feb 2024 10:34:01 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7249.032; Mon, 5 Feb 2024 10:34:01 +0000 Message-ID: Date: Mon, 5 Feb 2024 11:35:54 +0100 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20240205025823.4259-1-michael@niedermayer.cc> <20240205025823.4259-2-michael@niedermayer.cc> Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: <20240205025823.4259-2-michael@niedermayer.cc> X-TMN: [jzpcd9EuhMP6I5XiZhrZyMB0maKBgbLR] X-ClientProxiedBy: ZR0P278CA0033.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1c::20) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0080:EE_ X-MS-Office365-Filtering-Correlation-Id: 71451723-1c73-486e-456e-08dc2635f7f3 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6KArtnBevxYUytS7y65eWoph0Aw9S6NnCc99k9lCXRYVvm/8KpFRRT/Zids8rH+wiPDxXxMdgMp8asjIhJPJQ8zt8U8L8uhAQlyqC0ncRDDIinjhpwuUJh8jqukjPjPr7xEetKMtLzPaMvFWKihT3JXkOboW6T87KClhkEsVNK1P8YJ0mlQlqt6ga2l3wgiSTz33ZTXJLM371aXQNRtQLsL8z+FTnNCSWJMXaojkXKC3vjpcNOUvywgHfwL5xBogJ2eYQc4XCHyr9thR1SoqkRMKCdzaWvPNDg2yWgrg1MA66bDzF7hIXctxqzdTxIpf39Bc2d8ipMzcUCwN9vOSNYPT1Cy06S5b09z/1ta0NFVVHm7XgrfGYzOCKG4gbf1o1z8PrbfahAOpLr/Rl0AaTU4dKYM+xoQz3F+sAoTSrMd3z56vybyt9XtPfK4Qb3vpXexoEzRiMYVPfMrgRMPck5GZI0IHyeSooFVn14QuYGnhoq3zrKzHBiKnVQ9J9KSjfk9pzGIQnJJJ8H9ubQ+POyidhKM/85Ec326rPS1PdZcWcPsoyt5BCEB6V3onM3v/ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TDNJWmpDSnNqdGgxcFc4cjc3ZlN1YkdmNVNCaDlYMmRiUkluU0dwL21TZzhq?= =?utf-8?B?WFRQdU5BdmR6cXovNFE3U0JIOUUxemc0d3VMbFdCeGF2WVZxbExuVmhXV2ps?= =?utf-8?B?WkxicUd3UlZmVzRDZlJXS002UW9ibzFVTWV6blp6RTlUVUVqSGcvNGVTakUv?= =?utf-8?B?TG9Lc3M4dldNMEhOb0YrWFlsanhWUUt0WG84Z2txVytKbnozZU51Z05jcGow?= =?utf-8?B?RDUyeDhqVXpxMWRtcEV0QTFWMmVNT2VXSzlmcVA5bFR3TWdYK2U2REFXUWYx?= =?utf-8?B?bnpEdytIVFk2Y0VsOU5QY3hmTlRYU2lZWVkxa0hXT2J5Y3ZmZHliT1NBY0xJ?= =?utf-8?B?QnBBQTM5Sll6QStSbkpTYm9zc0xMQTRYSGlWVVBJaXBqNWhYRVlyYTVjSUUw?= =?utf-8?B?eW91bXEvS1poVGdsQWV5c3pvZnNhdUVqZmY2Y3Zpb3lrNjM1NXFlOWpEY2I3?= =?utf-8?B?YnFjUFBBNmxWR2R0blJFSmVUbEUzNWNpWXVQb2JwazZ2UkQ4ZU1QbFlkMWdS?= =?utf-8?B?ejVXd0VIampkRHh4VFJyZUhpL0N1S21yL2RzMU9YdmozakI3dnhzbElPemsr?= =?utf-8?B?YVdsNE1DeU5Hbm1kWDR0WTV1U2xKSk5xYXhaYlV6TzljdkxhenFZK1dmTWxQ?= =?utf-8?B?ZElBOGN0M05mV3JHNGVVN1JMNDNjdW85OG1NVVpUWU92UHJXNit1dzRxRFNH?= =?utf-8?B?YlU4RVBVbWdkVG9PNk9iblNYQU80M0Y5MUVZOEFzMzMxRXdidit6OXB4SklP?= =?utf-8?B?Q21QUXEwR25nVS85cUhKRUNaOXdLaGI0WmVFTGozd296cjEveGhIc0g2SDQ2?= =?utf-8?B?VXY1TWRRRWwzYStVVFlreUdqNStsanI3QU5WQmpXNlJ2S1g3VjBzVmxCQ1V0?= =?utf-8?B?K0RKdXZUOTN4MmpqeGtBMjRPdkF6cjJ5QUxpRVEwVk5YNy9OTjNnTENKaUpP?= =?utf-8?B?Mm9WQ1VKcDNTRDJSZjM1dHhNVDdZVm1pTVFhUGFlWENxRUxrZXJXRStnbDNL?= =?utf-8?B?TFpHdjV6eXd6N2VCQURGNzlJWFNDTERMaG1kQTd4a1REMGh5WWkrQy9VUFBJ?= =?utf-8?B?Zk1IU2kybG5Ydm5teWZjSFBjRWF5TjQ2aUJOTTVMTTBiT1pnck0vZ0NaT3dP?= =?utf-8?B?R3JlbE9NaW9uRkZIdTZ4dWlDaVVYZnVvblF0ejBXOEpxVzBlTEtURitwQVdL?= =?utf-8?B?YzhwSFVUaHBZVFNTa21hY2JGbXprYm1WQmJ5cU10YjlTaWR1WmNNN1F5MWQ5?= =?utf-8?B?YzZoSXBCNVFQQ3p0OFAyb0YvdnFHbnZDU3JhNEZtZVlvOG5MelQxZHB5Vk1P?= =?utf-8?B?b3lqN3pqVDB1cXlCa3hJam9PMTQzU1ZhbWFNSHdVSlJsa0kxc0JuNlhGbHJa?= =?utf-8?B?VkpQbERwbXQ0VVJkYjhhZ0NkOWVEQkZOZXNvakNYUmdFTXR5cG04QWdNZkc4?= =?utf-8?B?Y1ErOU1QRHpxTGlGeDVHNjFUWlRLcXUycFBGNVo3OG5jUUtuRlZ2QVZBenNa?= =?utf-8?B?YXNyV1BDM2JjbFdlUHd4VFhTMXU0N2RJMURIRUcrRlNoN2lVK3F3WmdxeEtU?= =?utf-8?B?Nm9yWmdYd2dDbmJpdVRvdjNJODV4Y3R0TjZMTFpGRC96dUZjRkQ3RW9yeEMz?= =?utf-8?B?MGZSdmtIRFRHbFhPZWJyNC8zV2FTekt0akwwbkdqamhvMWl6amt6R055L1VX?= =?utf-8?Q?tNX686PqXnvxRoJVPM+h?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 71451723-1c73-486e-456e-08dc2635f7f3 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2024 10:34:01.7841 (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: DU2P250MB0080 Subject: Re: [FFmpeg-devel] [PATCH 2/2] avfilter/signature_lookup: Do not dereference NULL pointers after malloc failure 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: Michael Niedermayer: > Fixes: CID 1403229 Dereference after null check > > Signed-off-by: Michael Niedermayer > --- > libavfilter/signature_lookup.c | 25 ++++++++++++++----------- > 1 file changed, 14 insertions(+), 11 deletions(-) > > diff --git a/libavfilter/signature_lookup.c b/libavfilter/signature_lookup.c > index 86dd0c66754..6e45fde1b5a 100644 > --- a/libavfilter/signature_lookup.c > +++ b/libavfilter/signature_lookup.c > @@ -37,6 +37,14 @@ > #define STATUS_END_REACHED 1 > #define STATUS_BEGIN_REACHED 2 > > +static void sll_free(MatchingInfo **sll) > +{ > + while (*sll) { > + sll = &(*sll)->next; > + av_freep(sll); > + } > +} > + This will leak every element except the second (if existing) of the linked list. > static void fill_l1distlut(uint8_t lut[]) > { > int i, j, tmp_i, tmp_j,count; > @@ -290,6 +298,10 @@ static MatchingInfo* get_matching_parameters(AVFilterContext *ctx, SignatureCont > av_log(ctx, AV_LOG_FATAL, "Could not allocate memory"); > c = c->next; > } > + if (!c) { > + sll_free(&cands); > + goto error; > + } > c->framerateratio = (i+1.0) / 30; > c->score = hspace[i][j].score; > c->offset = j-90; > @@ -305,6 +317,7 @@ static MatchingInfo* get_matching_parameters(AVFilterContext *ctx, SignatureCont > } > } > } > + error: > for (i = 0; i < MAX_FRAMERATE; i++) { > av_freep(&hspace[i]); > } > @@ -520,16 +533,6 @@ static MatchingInfo evaluate_parameters(AVFilterContext *ctx, SignatureContext * > return bestmatch; > } > > -static void sll_free(MatchingInfo *sll) > -{ > - void *tmp; > - while (sll) { > - tmp = sll; > - sll = sll->next; > - av_freep(&tmp); > - } > -} > - > static MatchingInfo lookup_signatures(AVFilterContext *ctx, SignatureContext *sc, StreamContext *first, StreamContext *second, int mode) > { > CoarseSignature *cs, *cs2; > @@ -572,7 +575,7 @@ static MatchingInfo lookup_signatures(AVFilterContext *ctx, SignatureContext *sc > "ratio %f, offset %d, score %d, %d frames matching\n", > bestmatch.first->index, bestmatch.second->index, > bestmatch.framerateratio, bestmatch.offset, bestmatch.score, bestmatch.matchframes); > - sll_free(infos); > + sll_free(&infos); > } > } while (find_next_coarsecandidate(sc, second->coarsesiglist, &cs, &cs2, 0) && !bestmatch.whole); > return bestmatch; _______________________________________________ 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".