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 5DCBB42396 for ; Sun, 15 May 2022 18:12:29 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 63ACD68B4B4; Sun, 15 May 2022 21:12:28 +0300 (EEST) Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2036.outbound.protection.outlook.com [40.92.58.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0D56D68B3D1 for ; Sun, 15 May 2022 21:12:22 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Hzg4HJxr9wMWxpB3hH+qVirhbfDt98woyCJ1SMYcxH2CEHp9YPZyZzHOI8AeL8+hrRtJcgQ7GpDVHadlg7rBbxp2o5icuT5j1O4mTr8Cc0432lmVkFTxXIvn5m9sXr/PHiDoyZJX1dmoOmSHUnbhUy1V/9pHN4JYlH4frXRGxDYSzxkQiXjSYosLqGDWQhCxgN4Qr/B6FI2ogrLChvtH2cAgZgiNSlYKTTj53RDPB4sMpoTXjjOr66mFMGk/oimAr+DU2ZSmV1TxbQPIBebUw3IDyFseK1nGaw0V3kU6qU95x6YP2pttz98DuGrBxBQR4HdSwzCHqL+GntPbnU/AxA== 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=iphDYacnA/uv+TrDNirfqLJOa1yxiAWn8huzO0sj1CE=; b=fohIamt6vs8p6h6ntXAc11RGwLZC6QAIA7VwmW49St5MwbMOEumZEchYZunoO7HEuuaua+gUErcMRnl1rAt4oKxkjAAmC09pJlvdGpa/YmphfM4GkY3WEBja27P6DWk8DDIqJQ10keM1lX9p1n8QzVwNgkDVGFgGRRkq6/GukFz9M87L5pRYDzxLxS2K/8byRKzX1Hty8Tkw5sOmNOHFeOGdwzVK7U0NLBaX9QPB9lTV1urZXpT4PL27NV5ywH+qm9odAfkzXFirfB5V5F/Gx+OO3sWJiBvh1rsYj82RXqSiXdatLbtn3Dw6kxXeM9u4ZFVLLNr94nM78hUhVRXOLQ== 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=iphDYacnA/uv+TrDNirfqLJOa1yxiAWn8huzO0sj1CE=; b=GWKDPaUYLoGQVeeJFLvet2trnKNWjwKahTTbN5qUhx131q9vu6yX0XwWuDSwDVxl8W9xS84aomJOfYhl4UzCSC1Yw4zbI4aHFf2vwuEO0RsdFYwPYhmkKAERDgNLGrwmAu00LXSW8E8SELa6xVcQUSO1RmNrub4NwV1Y4p39j8nrt7niitOdB9I9iKwkU4W8BDXSkxamCaKVUsSkeDKhoDkcDp/W12LWqhrH5/Qlgnxjok92OJf68KsTqGm0Fc9VXhZfUERSgGY5ZUYJXxLOpFuI9X9uXvcBaO2FORA4v4tDMxZpPlZQ1oefFYUcC8vdRM/tUYiDX6yXn9SoUdEexA== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by AS4PR01MB9986.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4cd::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.14; Sun, 15 May 2022 18:12:20 +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.018; Sun, 15 May 2022 18:12:20 +0000 Message-ID: Date: Sun, 15 May 2022 20:12:18 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <33b3d163dfcd61ae6f4ac258ae28fa0756436587.1652561722.git.ffmpegagent@gmail.com> From: Andreas Rheinhardt In-Reply-To: <33b3d163dfcd61ae6f4ac258ae28fa0756436587.1652561722.git.ffmpegagent@gmail.com> X-TMN: [GmDRhjmpS2KTNLCIKtornngwDX6Ds3J+] X-ClientProxiedBy: ZR0P278CA0158.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::17) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 131254ef-91ae-4ee3-232f-08da369e73cb X-MS-TrafficTypeDiagnostic: AS4PR01MB9986:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ObYaZ328EztjmeRaDz3Z4Ccc53sUHgTu/3WlB7b/GfbqIzpBMpLYWu4xEH7oT13QqkJelg2naR6bJ6a4AnWx1OjWzMZtZLKez7QP1K2eLuTJvVZ843yOM1C96XclkLm0oH7uC6+uLxVkX5zwvJUDw+fsUphjtuPYOPunK6vVGymThzYroOIPQbtjaJamqSaQOsik13iMYw+1wf2EPFbTKOcljPecV2tolkDXZ9IHaeKIx85CJbFx1weyn7gQEZwLmRnhr66aGzvc59uDNGbBxHFjpZXEuib/grc5wkVO9n6nRZjNodLpxY0VAPJVibPMbZGkcJAw2asaKk5x+3z8cyW52eVWGYlhTke9myIG3E9wfo1VM9BI2kuemNXC8t2OCwvnfxGAgHbJNJC/rcXMSRa20WWOZEFT3QkjMgVnUn2TJT4JlF6U78zwAgIrt2MTBqY4aWa39Tv5hGXoVUO8YUuUsMYrsvs0QD8BCCGGQbB3BOlFq0OR3gGft8wkybIN62WqWEcy+6ECbyxJY0WjRNF6yRQ/IgDlJ6JfLtuDfd+dBSsV8lwsCSRQgqRaweaqPFkLxhqInH99B11gmKrKDA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?clFRTGlwSzczMGxXaWRwcVlNMmltdDI5S0R4bWlKRktNV3FaZGs0dS95T1A3?= =?utf-8?B?bXF2SUdwVGVaM3pPallsQVJPSjlkY3JqdXNPTEFBN3pwbWhtVFBENjBPMzFa?= =?utf-8?B?OENHS3VBWlNWL1RIMGJhRWpXbjN0dFg4S3ZGb1plK1FNMFNDa3lnYXZvem0y?= =?utf-8?B?UUJNSU5CbnY5ZmVycXlwRFdHZHl1VkJ6Nm1tcExSR1dyM0dCZXZQR1pjMEla?= =?utf-8?B?RGtQSUZMNlJ4K0pZazNwZDFwcE9ma0M5TXVqQld3OFBtOHR0Y3REV0VST1Js?= =?utf-8?B?dURVTGJyU3d6RHJ6enhCZDFOSlRGeGNXRURPdGI0YTNOMzBBQWdzUTB0MUNH?= =?utf-8?B?MGZaS3hobldxUXBPVVE0MU9pREhvVFBSL0NFUU5SSVBCd1lNY0pBN2dLbldl?= =?utf-8?B?blB2OE5IRUhUSEd3RlJ1OTVEdXhiY3ptRThSSDNXRUlxZkN0ZXUyUitXaGZq?= =?utf-8?B?eGhxYk5Da01YVVJMbmZhRUc5U2lRRjRPbkRQNFZOd0ZEQjV4TkRoWkM1dXpi?= =?utf-8?B?MnBhUXVLMCtiVHBzU1VEZjJFa3h0dTN2Q29PdEVkZHZ4Lzl1czloeGJNSDRT?= =?utf-8?B?dVR6WjJHUVI5S3FhaTdUZjBoVGYwMEk5T2o3L3pkSWRPeE5GamZqRzdsQ3E0?= =?utf-8?B?ZVUvbVVjRFIrenJSbGhLYUdSUUc5UWFURVdHa1I1dmFXRmdzWFR6cUorM1Y5?= =?utf-8?B?MWZyQ01ySnNPQXl2QkpYTy9pdzY1Sk9xTXJkU0xtblJGd3U3bG8wdmlDSWlt?= =?utf-8?B?aVFMV05NUFpNYXlIVHVzc2RQREdJTHpMajd0enRJUWpiZTk4TWxOenhEb3lC?= =?utf-8?B?bHZvRnE1Snd4M2krV29ac0J3R3YvdmozY0Rqc1FybUt5ZXdYWmVvaCtKa3cv?= =?utf-8?B?Z0RWdytvWkFmYk9DOUhvTHBVTG10b3JyelFKNWJVTmVvWnVKRW1jK0l1UERr?= =?utf-8?B?QlhUZzVhR0RtR1A2RnNSa2plWjhSaUFFQkphYVpVNWx4clVpWDh2eXZlODdZ?= =?utf-8?B?blFZMXQxcFJ0ejVvL2g1ZHBtcFEweG5NaFoyMEEzUGN4amM0RnBrbXlTbElr?= =?utf-8?B?YW9SRThjRXlxdzBXN1QvTlNQVVY3anV5MExxUkV4eENWNEw3SGFtTXJLVUZS?= =?utf-8?B?REI0clY5Y3dTTVo1NEQwaFlFbjBCekg1ZTN1MXZhQ0Z4VCtRaGlMOTl6Q3c4?= =?utf-8?B?QzF3UmcycGttRVcvMlNlR2tJU0l3Tk13OE5ackg1dEVJWFdLT3ZxRkhnODlF?= =?utf-8?B?UzJTMFh6ekkzZFBYR2daSk51aGh5eXVTaTJmS29VL2djY1NncVhzUUFsdUpT?= =?utf-8?B?a1pwQnhqV2hVdTg0NkE3SldXVmd3TVhINDZ3SE9CQkZHdDdzelRvNUZaeVZr?= =?utf-8?B?MTNkekJsR040S0k5QWsrdzcrWEZMeUZCTDdkSnMrQmVQTDF6REg4elJJd1BL?= =?utf-8?B?d0FlQTZoK0ZXYlBHcDB4bUJMKzAwNTlPazlML2lPbGVBYmpLYmlBU3pKd3R2?= =?utf-8?B?cDdhMWZDczBickNpeUxwZ0ppNDV4MEZSNklDQ3lXeVN4YU9VaEE1dEF1MmZy?= =?utf-8?B?elNXTEp0b00vdGdDcDBYbDJBb0NHdVpuZy9UNXp6U005alk4Njl2SE5XMHBv?= =?utf-8?B?d0crMHNSMGhON1VJMHkxUGxjcHAxTWpvcWREa1pPc2FKRXJNVEUzTWNJTksv?= =?utf-8?B?S0U1REJhNjRIUDdBYzhJdzh4NjdtRWN0YmpIeEhhZTNsVFNzY2VRZy84bzQr?= =?utf-8?B?ZUdsQStyLzE2ZkVkSkpWbmZSQzBEUkNZZHB4dlY1eXdKVDYzUTlVeEJJQUNR?= =?utf-8?B?aWFLaG9mb3JHYkRkZ0RDR05ZbGs3dEhKRk5zaWo4TUZjOFlSMVN5ODZDVnli?= =?utf-8?B?Yk5jcTBzUXc2UjlpN0gyNEhDSE5Ibkx6YlZDQ21IZ0IwUGZlUXowUVhLeXl2?= =?utf-8?B?U1Y2cTF6bE5pWmhycDFqT0x0N2VteUtwMjJlZm8rR3hFSWdIT1ZQM0NPM0ly?= =?utf-8?B?bW9FMzltMTB3PT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 131254ef-91ae-4ee3-232f-08da369e73cb X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 May 2022 18:12:20.4271 (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: AS4PR01MB9986 Subject: Re: [FFmpeg-devel] [PATCH v4 06/10] libavformat/asfdec: fix macro definition and use 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: softworkz: > From: softworkz > > Signed-off-by: softworkz > --- > libavformat/asfdec_f.c | 24 ++++++++++++------------ > 1 file changed, 12 insertions(+), 12 deletions(-) > > diff --git a/libavformat/asfdec_f.c b/libavformat/asfdec_f.c > index 81a29f99d5..91c3874ac7 100644 > --- a/libavformat/asfdec_f.c > +++ b/libavformat/asfdec_f.c > @@ -906,21 +906,21 @@ static int asf_read_header(AVFormatContext *s) > } > > #define DO_2BITS(bits, var, defval) \ > - switch (bits & 3) { \ > + switch ((bits) & 3) { \ > case 3: \ > - var = avio_rl32(pb); \ > + (var) = avio_rl32(pb); \ > rsize += 4; \ > break; \ > case 2: \ > - var = avio_rl16(pb); \ > + (var) = avio_rl16(pb); \ > rsize += 2; \ > break; \ > case 1: \ > - var = avio_r8(pb); \ > + (var) = avio_r8(pb); \ > rsize++; \ > break; \ > default: \ > - var = defval; \ > + (var) = (defval); \ > break; \ > } > > @@ -1003,9 +1003,9 @@ static int asf_get_packet(AVFormatContext *s, AVIOContext *pb) > asf->packet_flags = c; > asf->packet_property = d; > > - DO_2BITS(asf->packet_flags >> 5, packet_length, s->packet_size); > - DO_2BITS(asf->packet_flags >> 1, padsize, 0); // sequence ignored > - DO_2BITS(asf->packet_flags >> 3, padsize, 0); // padding length > + DO_2BITS(asf->packet_flags >> 5, packet_length, s->packet_size) > + DO_2BITS(asf->packet_flags >> 1, padsize, 0) // sequence ignored > + DO_2BITS(asf->packet_flags >> 3, padsize, 0) // padding length > > // the following checks prevent overflows and infinite loops > if (!packet_length || packet_length >= (1U << 29)) { > @@ -1066,9 +1066,9 @@ static int asf_read_frame_header(AVFormatContext *s, AVIOContext *pb) > asf->stream_index = asf->asfid2avid[num & 0x7f]; > asfst = &asf->streams[num & 0x7f]; > // sequence should be ignored! > - DO_2BITS(asf->packet_property >> 4, asf->packet_seq, 0); > - DO_2BITS(asf->packet_property >> 2, asf->packet_frag_offset, 0); > - DO_2BITS(asf->packet_property, asf->packet_replic_size, 0); > + DO_2BITS(asf->packet_property >> 4, asf->packet_seq, 0) > + DO_2BITS(asf->packet_property >> 2, asf->packet_frag_offset, 0) > + DO_2BITS(asf->packet_property, asf->packet_replic_size, 0) > av_log(asf, AV_LOG_TRACE, "key:%d stream:%d seq:%d offset:%d replic_size:%d num:%X packet_property %X\n", > asf->packet_key_frame, asf->stream_index, asf->packet_seq, > asf->packet_frag_offset, asf->packet_replic_size, num, asf->packet_property); > @@ -1144,7 +1144,7 @@ static int asf_read_frame_header(AVFormatContext *s, AVIOContext *pb) > return AVERROR_INVALIDDATA; > } > if (asf->packet_flags & 0x01) { > - DO_2BITS(asf->packet_segsizetype >> 6, asf->packet_frag_size, 0); // 0 is illegal > + DO_2BITS(asf->packet_segsizetype >> 6, asf->packet_frag_size, 0) // 0 is illegal > if (rsize > asf->packet_size_left) { > av_log(s, AV_LOG_ERROR, "packet_replic_size is invalid\n"); > return AVERROR_INVALIDDATA; While protecting macro arguments is good, it is not really a "fix" unless current usage is buggy. Which it isn't here, because >> has higher precedence than &. Furthermore I am not really sure whether removing the ';' is even something worthwhile; they are surely unnecessary (being null statements), but does this matter? - 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".