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 164FD4922B for ; Tue, 6 Feb 2024 10:34:38 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2220C68D15D; Tue, 6 Feb 2024 12:34:36 +0200 (EET) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2052.outbound.protection.outlook.com [40.92.91.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 47BB168C7F2 for ; Tue, 6 Feb 2024 12:34:28 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UyPIFvl0ATe4I/1CsxJTQAJJevoaod7dZon0KmXdb9lDb5tVYDUd3oyAuFskj0d8PWyn7RhZHu5ZAig4Wlep2spd+kzx+XmgVORqQNSohI7fN3RkrRsrH+NArtZ0QYH3qnzmXfB2R1dBPIhAYO/xZkpdfq0ywSXPwySoUWJE47WrqCzPlyuoOZLY/32Maf6tVPU1nq4BgfBOtOnKDMDCNpHxy+9TRJGLZL4kpnFomcsFs4r1X27X9eflNRykSdKapyLt1tlePxTvF99e+FCjCk79M4yIucIrOC9dEz99mJTTvjnh9fpBIo2nqj8lsiSG9xNfYBmU+pJsjHSN+LPsQw== 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=rdwvmCUQXG//z8NqNZ0f3yuYMe0NXWqxDAv0Dry8Igo=; b=NOkusckpDEhO2d5LdEcd1uhDhm+J2U9FEGN4e0+gDtFrQXeKIye7hutiyFHSSwC5nJ5oWlkzR6cXiZFV6idxi7529jmDvPcPDh+szYct7cjUmaXYXIC9zna4nfKJ12oQl4XHt5IdaF4JqOIch1CRrhi1wWyg2e6Fv+Y0l6hBYMm8Z4nidSyOtwkIkTaSER3uu647Kkpc5jYcj9jf4fJZG2Ld1jjmVYi8Z5CT5kYokxjRaExlK22ZVx1sQc8iHk92QDSG4aPFTRqgannBW+nki2VShMULDfPtYhWyiUMzQ50jK4B/SiSAED3ycjLkfGqVhekW8ZC8NGX8JgeWsp8sJQ== 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=rdwvmCUQXG//z8NqNZ0f3yuYMe0NXWqxDAv0Dry8Igo=; b=sk7VpAn84Ihob2+cbZp5AJQEcfcmuLNPcKjR23L0R62bokzJQvruGCWV95GQ070+s4qOMW09J2jdfUACtqoJn+lOPQGzLcHH8ulFqwK2gOu352Gze/ThIzidFay4jOYoUetg9iHmKTKsmHdeC+u8X6dFybbIpdtzdEW1cW9Bg4iQz3EQ4JKmPQRMUMrA3eQzBQIv3hQTXn9PnjwXguKRdf5TDpxpTnjkTwUFwJqcIyJzITEzhhHX6QFmgcwvY3RqG95jd9AWNnzCiXovZXocymf0W+xV2NsySNlPizj9LOQXfk/hfvsdWaaMfRz6Vf0CC4lSDDGfnq0U1veRqz2ejA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0131.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:176::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.36; Tue, 6 Feb 2024 10:34:22 +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; Tue, 6 Feb 2024 10:34:19 +0000 Message-ID: Date: Tue, 6 Feb 2024 11:36:13 +0100 User-Agent: Mozilla Thunderbird Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20240205114459.8317-1-michael@niedermayer.cc> <20240206004001.GV6420@pb2> From: Andreas Rheinhardt In-Reply-To: <20240206004001.GV6420@pb2> X-TMN: [C4R2sNV5A0BTjzHuGL0wWzNVnlg2OhYh2CRERhqFHyI=] X-ClientProxiedBy: ZR0P278CA0020.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1c::7) 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_|PR3P250MB0131:EE_ X-MS-Office365-Filtering-Correlation-Id: 3e82d877-f580-40ee-d41a-08dc26ff2d25 X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnqmcPDF1KAd/mmqN5uWR7ypmyTgoCxjFFqkUnrVD879b0SKtq6M6Z7r13Hs/Xp+gkWM39YPyThNQy4AwHJ+6pC5Dp1RVd7hkjUW4IiyfLB6E5M8vHLTVkVG7LbDoYnSxg9D0bdsmmNodpK8sTdcJ+QujY+lZ+sbk0CLhF0DVg2eqUfojyAJb4XZrHbXWY42BZCckdFSdgywsCgpqotgqBhW4homgq0c+TVkOe5UEwBWdE4zUjp2gMoQyXPmY5krhmRFtkcBDRloY0ixjWjdFaH329ZJG5bG+Dl9GqB9NrILVW7SEnK309kc8K59xAWcXEDws3Z2P3GywbLIoot0MSfhmU7yqgl2gJ1YSW2Omq1eYw38NlfF3pJLpircsEy2PxejzRzH/7TPbRs+qwltEeOX4cuj5iAs2Z492f2xf7A1/rk4qAgsYiBCbhvvUGODhVLmTo9n7WKKNhu2cNP1hm6xEWCyAPZ04gfC8CF+GnyZoMh/22ZLjV8inhwD8OlY/va0wOkLIKwMNAgmYpUh3itP0618CDSkymzH3UOgrEQjp0E93yA/2Ig8hd6Z7qzW3PqALlvcQ/ZJHFI/tfXmsxfeDHrQ8FnFtKd4XWOnF0/UMCQ34fioQFeOGCTr5wj8W6eowblnDCq4HIg9xnbD6OzuoD2BN2/dm89Oeh+LHcjf4qxujUcu/v7gUgmPFfWuO/EsoWKicaFWNBSrAtMlCBxar1HwMjTiz3+2hOLtAgIXPAurXPfobOSOXP3ylifqT1E= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CCB3JgdyiEWa6jNAwYzsvBWWWQkBZwYZ4jfLSUO74h6W6S+rX4u28ePxL0R4VYUUGN9GMDQ1hzF7CzRxn6n+q4MthJoyDBS+jJ+cqwEEju8rgOSv73rj4tJmjuRbkzPxNEGxwKSLKWLIV4/WuoWmDua6z2RRuLGV6cnvv/peXjHqpPn/9K+EGmJE5zRcRwph6THTZP8NskwOf3d2JULuLfA6EXjitaO7AGtuUaJpB6S/YIu/YKoGuquW7qUXRbs6kSp8X3og0mjJCti56oUzY96JhUAWJzOR/8NucgMzMe2nOa6361vgli7MtuOKiQBk8SeL2ElKenNgoo0PHo3onKPwuQ7mogQyeoW9/ofSWLwhJ5GO+Bv1YQb11A1ht2wMNiweiolBzVh2mSDzkRZKvRtBV/D/PRB1FgKoZie0/7jeg5poT8jDvHJwc3YXJIls84sZeZy45Pn0NTF1fFMmCkqxa8eVuCxxT6UxnfLU0IMHQMyxzcuMb6O43ZMXuUmRmg0VLtuPwt6xWo84Eq4JvcgZHVRegGv1CF9gaJIiWnYLWuhBnNgNzkHuzo7uMpM9 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?NXRVVHhuYUpnM2cvSjBPczVxWFVVeVlpbnVUMHI0ZVNRQS9nRzVhaFlVeklx?= =?utf-8?B?U0ZYOFB2ME9xd1dQSGhESDFpNjFvRjk3TGE0Wmw2QVVrbG1YNXI0MlZsN2hE?= =?utf-8?B?SXVqbjg3ME9KZ0gwY0NISkZsZSszdzlORHJPaTQ5Q0JqNmxMMEdCc1RaZlpM?= =?utf-8?B?YVVyb3pwQytiSmF5TndudXAvMkptWkRPQnIyc1JscksycnF0SGIyaWF2TVJL?= =?utf-8?B?T0pybUZkZi9QY0ZSc0prWGdyMkh1djBmSlB3REl0c29PMVk2Vk9FVFVOUXY5?= =?utf-8?B?WVFKOCtPZGt1dElFakhmVzhiMzQ4dmJoMlFIQUVVSlF6bERIR0xQSXJISXZw?= =?utf-8?B?Y3FxcWhXUmg4M0hmUjhLalBRcVRDYmtZd08zU3J6RmZNZ2JpY3E1TjdrTVA0?= =?utf-8?B?WjFJTHM0cUxZVGU4NE5YNnNBY1kxQVNQZUoydzVHVW1JTjJJRTFaOElQTng4?= =?utf-8?B?MDNQNkJGa2crcWUzZUxUYjM5U2ZJb2xTU3ovT25uWnpVd3hrWTNGa1NESUlK?= =?utf-8?B?NjR0Y3dkMnpUR1dLandwcm1GQTVmNVpMRHo4TkZUczl0SkZvcnpLbUwvdDRx?= =?utf-8?B?elRiRFMxbnVNOXBTL1FnSGNoUEo2MHhneTA3ZFhWMjExWUNvdnRoZ2QyclJK?= =?utf-8?B?OGkrQ0lLMlZDUThDUGdGekZlcDlQUjBocjZhdFUrb1F0NXFnaXFrcFN0VXk3?= =?utf-8?B?UG5mbzZaSlpkZjRzTytPc2x0eVdvWkhKSDByZDNFQUJRaWtwZUoxdmZoM014?= =?utf-8?B?MW5ucnp1NklEbGJmeVh1SDRpVTAranI2NVg1Z0orRjBqWnZWalRYZ243RllF?= =?utf-8?B?Q2hZNEk2NFVsYTdvSHhhZWxQV0ZnZ1dydktGTkIvNDZnM3p6dmhvdXdTQzRq?= =?utf-8?B?ZytGQ3hQS1BBQ2Q1MGt4di9BYTl2ZncyVlpzeVV1Sk81NGRqUjNnODVLN3JT?= =?utf-8?B?YTdmTjQ3aCt0T3AxaUhiMHIvVEY0VFQ1UDdNODdyalMreTNrN3BaaWh0VXpV?= =?utf-8?B?aWhueXBFV3ZrenhEeUlEZmh2aU9NZzdIVHcwNVowdlB2ZXZPV2pGdjJ5UnpT?= =?utf-8?B?cVBNT0N4dkpBdFhZNzAyOTlTQXFudkpRWlg0OUxRTG1uRU1SNy9jM0RGSUlu?= =?utf-8?B?eHhWMlpOUEZBMGQ4QlNCZzc0ek9kWndINUl2R2dUVHA2QzI4dFZvbWZFYXZ4?= =?utf-8?B?ZnF0bEF4RDRXVDNKSlRzTTFRRmk1dEFJYXlBWnN4UloyQUJmTmV1bXhxbnQ1?= =?utf-8?B?MHZ6TnhoNmQxMEZuTTk5bkQ4dGtzbXdDNUo3RFVZVXU5MHJERTVzcjBHTnVk?= =?utf-8?B?cWJ0b09nN2NLbjE1MnVmU0EvOWJOREpoSUZ6YTJyWVRpa2gxOFp6cWpIck95?= =?utf-8?B?OWFEZDA0Z1JIZ3M3VXF1VE5VODFFNURnL1o2QXREbXh3cG5VOEticnZsY0oz?= =?utf-8?B?THZUYmJPM0QwRzZXWFUydUw5c0NUTTFSUzluT3FRY21Mbktwdm5DWS83QjZJ?= =?utf-8?B?NGF0SGEyNElnSXdTbUE4aGVXV3dDMDZ3bmNaVDd4ek5OQnNoV3VGd3dva1BX?= =?utf-8?B?NXZaRzlhRHBWbDV1RzRKaTBndmpoVXZpYnRsUFd2c0gyM1Fxb3p0N2oxMU9o?= =?utf-8?B?S1dpbndiU3VHUjNOZ1FCdk1ZOFlVakkydnlZT1hSZVZQajZPL2RxcTNuTk52?= =?utf-8?Q?bsBn9LkMhoOKMwkR5P5Y?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3e82d877-f580-40ee-d41a-08dc26ff2d25 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Feb 2024 10:34:19.8103 (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: PR3P250MB0131 Subject: Re: [FFmpeg-devel] [PATCH 1/2] avfilter/signature_lookup: dont leave uncleared pointers in sll_free() 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: > On Mon, Feb 05, 2024 at 12:51:57PM +0100, Andreas Rheinhardt wrote: >> Michael Niedermayer: >>> Signed-off-by: Michael Niedermayer >>> --- >>> libavfilter/signature_lookup.c | 21 ++++++++++----------- >>> 1 file changed, 10 insertions(+), 11 deletions(-) >>> >>> diff --git a/libavfilter/signature_lookup.c b/libavfilter/signature_lookup.c >>> index 86dd0c66754..52a97e1bc7e 100644 >>> --- a/libavfilter/signature_lookup.c >>> +++ b/libavfilter/signature_lookup.c >>> @@ -37,6 +37,15 @@ >>> #define STATUS_END_REACHED 1 >>> #define STATUS_BEGIN_REACHED 2 >>> >>> +static void sll_free(MatchingInfo **sll) >>> +{ >>> + while (*sll) { >>> + MatchingInfo *tmp = *sll; >>> + *sll = (*sll)->next; >>> + av_free(tmp); >>> + } >> >> This does not clear the pointers at all. This does (and avoids >> indirections). >> >> static void sll_free(MatchingInfo **sllp) >> { >> MatchingInfo *sll = *sllp; >> >> *sllp = NULL; >> while (sll) { >> MatchingInfo *tmp = sll; >> sll = sll->next; >> av_free(tmp); >> } >> } > > I tried it with code below, but your code is not different from mine in behavior just more complex > Your code indeed resets the pointer; it overwrites the pointer once per loop iteration and so sets it to NULL in the last iteration. I somehow overlooked that. I actually consider your code more complex (my code resets the original pointer and directly traverses the list, your code does the same, but in between it overwrites the original pointer to store the next pointer instead of using a simple stack variable for this purpose). Apply as you wish. > output: > (nil) 0x560e8daad2c0 (nil) > vs. > (nil) 0x557ae6e472c0 (nil) > > sll_free_n2() is simpler and will clear all, the reason i did not > propose it, is its recursive and can hit stack space limits in principle > sll_free_n3() and sll_free_n4() are other options that will clear all > but maybe every choice contains bugs, i didnt really test them with more than one testcase sll_free_n2() is not recursive. > > ----------- > > #include > #include > #include > > #define FFSWAP(type,a,b) do{type SWAP_tmp= b; b= a; a= SWAP_tmp;}while(0) > > static void av_free(void *ptr) > { > free(ptr); > } > > static void av_freep(void *arg) > { > void *val; > > memcpy(&val, arg, sizeof(val)); > memcpy(arg, &(void *){ NULL }, sizeof(val)); > av_free(val); > } > > > typedef struct MatchingInfo { > struct MatchingInfo *next; > } MatchingInfo; > > > static void sll_free_n(MatchingInfo **sll) > { > while (*sll) { > MatchingInfo *tmp = *sll; > *sll = (*sll)->next; > av_free(tmp); > } > } > > static void sll_free_n2(MatchingInfo **sll) > { > if (*sll) > sll_free_n(&(*sll)->next); > av_freep(sll); > } > > static void sll_free_n3(MatchingInfo **sll) > { > while (*sll) { > MatchingInfo *tmp = *sll; > *sll = tmp->next; > tmp->next = NULL; > av_free(tmp); > } > } > > static void sll_free_n4(MatchingInfo **sll) > { > MatchingInfo *tmp = NULL; > while (*sll) { > FFSWAP(MatchingInfo *, tmp, (*sll)->next); > av_freep(sll); > FFSWAP(MatchingInfo *, tmp, *sll); > } > } > > static void sll_free_r(MatchingInfo **sllp) > { > MatchingInfo *sll = *sllp; > > *sllp = NULL; > while (sll) { > MatchingInfo *tmp = sll; > sll = sll->next; > av_free(tmp); > } > } > > main() { > MatchingInfo *mi, *m1, *m2; > > m1 = mi = malloc(sizeof(MatchingInfo)); > m2 = mi->next = malloc(sizeof(MatchingInfo)); > m2->next= NULL; > > sll_free_r(&mi); > > printf("%p %p %p\n", mi, m1->next, m2->next); > > } > _______________________________________________ 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".