From patchwork Thu Sep 30 02:58:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 30677 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp213453iob; Wed, 29 Sep 2021 19:58:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw/a+gpTYToXT9lv/Tm7PuCNfTvdku0fx0NQ6543bqM+vWRlSkPdfKnFaiLQKEnsQup+Weh X-Received: by 2002:aa7:d649:: with SMTP id v9mr4420969edr.38.1632970724148; Wed, 29 Sep 2021 19:58:44 -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 n11si1955963ejl.110.2021.09.29.19.58.43; Wed, 29 Sep 2021 19:58:44 -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=@hotmail.com header.s=selector1 header.b=KzUZ+Iuo; 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=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 220B368A77B; Thu, 30 Sep 2021 05:58:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam08olkn2086.outbound.protection.outlook.com [40.92.46.86]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A94E868A76F for ; Thu, 30 Sep 2021 05:58:32 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Z3GYJsQrbHxOPCXbJU1q0HGzywe5WHmsM1d5bg75Tb90mYCo1DY3JEFdSutDArssD4vVIxVkPhemSiiwLPwIEifoaH+iy2IS0QtMoh2OM4QsF3lh3d6xmYF1aLV/seTSbw4Q26tRCm3afhPAxfhxukdQgrv+lNYnihPbSYhmA58FrynsII8Wbi8Dcyr9lm3LZnuzF6iMivlwVNiSdvE4P80weqYvuCfYtaGbHf+fYUVOTDpwji0lkU+qehCdxbIcDIt9B8mzm6rvbgeM3nLsa/R0F0ei/kJpNSZ7eLKuYAUzI+hMLAgSS776Jw52FpmxsaBDYISQH8j2y4VpoEqzKg== 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; bh=BcrgnZOcaFvfyTwOvVVaqnc8ciF18PUyBCiB4yyKp0g=; b=DSdJJZNaq/HpBjQt3EGHqt3rqDpckp5/fyRWQGPUJ/J0A/OnHVs/I2WQcPW6+NLyDgBGbCSrkDbNJHQroELdIegxObZHhKtQfanf7cgvNgafSB8l0kkw5a3nrmwHfRU/aYFsqp0MTyldgXtGY/nvtQKspUgWesFpflyhZIxRNrlJ3kK9QFX54MTDsFsKfk7BJePe6Y2ck2hEyx6XVEpI9CqlWZMUAVFQO0vDdGygFI0Rh9oTm0k+Hhh2rcFEK859NKHTj2LTYYunc53AnA1BnTFihJW5GZvyc6YPPuph9+bQ3NrFOHn18M7BDblDtGn1uYVBEGV/1oyg6S7p1cs2+A== 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=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BcrgnZOcaFvfyTwOvVVaqnc8ciF18PUyBCiB4yyKp0g=; b=KzUZ+IuoENutaHZnJEwnipFPSBIrlNu4r1S0dei9CAhyocBBxLcg5sTeFI/v8dkQZyjbcGccE2W9VIjdgvdHOYX0rfPEZ6IMcg4qvMZvhTKGuf5qX+wN3qstnq4Zzp9aBam9v/kWn7Y5q7F7WFPXihOy35VCtQsk7joiflUI3xXjCVeR2rfIFyIE5i7mQD9gyyIQnpmb67fDDyGrWa951omYL9zk+9+yLJEg/moecuya3cV6TEDVCtJRXNci8FaZ+WdMDWw046KaFSu2q6oowdASxR1ZrQSoR4rsowYh35dxB4Gl8PcceqjmO3dNy1e+68+Ypn5a2hwuTbx/fmBNQw== Received: from MN2PR04MB5981.namprd04.prod.outlook.com (2603:10b6:208:da::10) by MN2PR04MB5503.namprd04.prod.outlook.com (2603:10b6:208:e4::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13; Thu, 30 Sep 2021 02:58:30 +0000 Received: from MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb]) by MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb%5]) with mapi id 15.20.4544.022; Thu, 30 Sep 2021 02:58:30 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v5 2/7] libavformat/asfdec: Fix get_value return type Thread-Index: AQHXtacMoOFoM0i530qCizcJ+gxEqw== Date: Thu, 30 Sep 2021 02:58:30 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [//BXGw0UKI5sps2wve91nkSO97pCxFki] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: a3c900d6-7f78-4741-b844-08d983be2f15 x-ms-traffictypediagnostic: MN2PR04MB5503: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: lyhg+CPJ5FMj9zCMWmYwi00RWvIGF6hh8yphMCGVVg/cY1T0nNivtjcLK0x62YajnvtTQVHqgou8vKTk+XBf8VUoOrr5SWOyZd5FhlcB+7uL9R1g6yIjsFyw4ObKngPUU5wwCfu1O7qYLvDAKrMZ4NF1YRO/dJPN76JTQ/uAprsbl5vs0jfzs7/uCgWH1SfO/ZieQ06qOZbqZf1+wShKrrATVMkVlVnz9AParTdGRn2fXKzDRd38JvmBTL4eaB6g/BAqlmXDIDNvUKLiYh8nf7Vu2Hir89Caf446M//OGPeOXpY9ybCVKyj9QhYlpM5B9qMSJaYSTOAXHEfcJnxYkjC9rJCjcwxXX51guNVaDhJZlHE4OPt/qA50abDZ4Rvr6Ff6OZg861tmJd+zYQg3UqOK0Y0HIgbdMPlA/axx9wK0ZW3n0N7KXt2wJiWUnUDD x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: eSieb8HTiAfNBP+/tNJAdFAguAJ79LIcEgTwlqcdiwrxwZHx/5VYKCRu1o5Cb+ngzsEdvI6U4AlmX7WHQyt+TpAIViy08Ny1k0t/UI8B7sIIOsbkLKVRzzVDd00v76xbjJ1AeZcttlRYQy02kgeQtQ== x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3174-20-msonline-outlook-529c7.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN2PR04MB5981.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: a3c900d6-7f78-4741-b844-08d983be2f15 X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Sep 2021 02:58:30.4524 (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: MN2PR04MB5503 Subject: [FFmpeg-devel] [PATCH v5 2/7] libavformat/asfdec: Fix get_value return type 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: sl9DSaGcOwWt get_value had a return type of int, which means that reading QWORDS (case 4) was broken due to truncation of the result from avio_rl64(). Signed-off-by: softworkz --- v5: Split into pieces as requested libavformat/asfdec_f.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavformat/asfdec_f.c b/libavformat/asfdec_f.c index 72ba8b32a0..076b5ab147 100644 --- a/libavformat/asfdec_f.c +++ b/libavformat/asfdec_f.c @@ -202,7 +202,7 @@ static int asf_probe(const AVProbeData *pd) /* size of type 2 (BOOL) is 32bit for "Extended Content Description Object" * but 16 bit for "Metadata Object" and "Metadata Library Object" */ -static int get_value(AVIOContext *pb, int type, int type2_size) +static uint64_t get_value(AVIOContext *pb, int type, int type2_size) { switch (type) { case 2: @@ -568,9 +568,9 @@ static int asf_read_ext_content_desc(AVFormatContext *s, int64_t size) * ASF stream count starts at 1. I am using 0 to the container value * since it's unused. */ if (!strcmp(name, "AspectRatioX")) - asf->dar[0].num = get_value(s->pb, value_type, 32); + asf->dar[0].num = (int)get_value(s->pb, value_type, 32); else if (!strcmp(name, "AspectRatioY")) - asf->dar[0].den = get_value(s->pb, value_type, 32); + asf->dar[0].den = (int)get_value(s->pb, value_type, 32); else get_tag(s, name, value_type, value_len, 32); } @@ -630,11 +630,11 @@ static int asf_read_metadata(AVFormatContext *s, int64_t size) i, stream_num, name_len_utf16, value_type, value_len, name); if (!strcmp(name, "AspectRatioX")){ - int aspect_x = get_value(s->pb, value_type, 16); + int aspect_x = (int)get_value(s->pb, value_type, 16); if(stream_num < 128) asf->dar[stream_num].num = aspect_x; } else if(!strcmp(name, "AspectRatioY")){ - int aspect_y = get_value(s->pb, value_type, 16); + int aspect_y = (int)get_value(s->pb, value_type, 16); if(stream_num < 128) asf->dar[stream_num].den = aspect_y; } else {