From nobody Sat May 18 10:07:58 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+91443+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+91443+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1658137450; cv=none; d=zohomail.com; s=zohoarc; b=d5if8G958p3yFq22UU8r5rUM1r1wRQFkeB7I0x/YiMiVpTtUdZ8qflAiBZQslOlUSFka3bug4LjM6HyDvBQrSwgUUED5XeyzQUThToGfbRFPis8RMipM6YX7TI/3ufKjPUCmSY6LtXRZeKWV0k4GY1r/v12EVUDjn6EZ92XCioI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658137450; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=7B/LFVUAX0AneVX2YfOWd7npPVQOL7e4VdUJn8tijVI=; b=M+IaVWRsyT4LGPzcLrt3Ks396zAgZvVi02u6wq3z8WqqjSbKoR3kmzZ7pkbnBd3HUDkerITSqesqm0c+eBHWrZfCqnhdinY7CDyL7LzEGrh3veHiUyuu9PAAJBfcoi4oSoDRY7T8sLvREWLtAaFCrY8K8O6mkpdu208kc4p3TOM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+91443+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1658137450494121.38567927045494; Mon, 18 Jul 2022 02:44:10 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id lG58YY1788612xnycLBGJqfq; Mon, 18 Jul 2022 02:44:10 -0700 X-Received: from mail-lf1-f51.google.com (mail-lf1-f51.google.com [209.85.167.51]) by mx.groups.io with SMTP id smtpd.web10.25016.1658137448953388480 for ; Mon, 18 Jul 2022 02:44:09 -0700 X-Received: by mail-lf1-f51.google.com with SMTP id e28so18336227lfj.4 for ; Mon, 18 Jul 2022 02:44:08 -0700 (PDT) X-Gm-Message-State: JMXgSKqLvSwztnqPhB7tDt6jx1787277AA= X-Google-Smtp-Source: AGRyM1vsOKOqpk3lZkU8jTdY6D9bj9q59ASRKMvT+Qd/cqcHwzsDPWU4vD/eoPMe1crkxKbL75kOKQ== X-Received: by 2002:ac2:530b:0:b0:486:6982:5ab5 with SMTP id c11-20020ac2530b000000b0048669825ab5mr15093062lfh.138.1658137446537; Mon, 18 Jul 2022 02:44:06 -0700 (PDT) X-Received: from PC10319.67 ([82.97.198.254]) by smtp.googlemail.com with ESMTPSA id n3-20020a05651203e300b00485e55192a3sm2297306lfq.72.2022.07.18.02.44.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Jul 2022 02:44:06 -0700 (PDT) From: "Konstantin Aladyshev" To: devel@edk2.groups.io Cc: bob.c.feng@intel.com, gaoliming@byosoft.com.cn, yuwei.chen@intel.com, Konstantin Aladyshev Subject: [edk2-devel] [PATCH] BaseTools/VolInfo: Correct EFI_SECTION_VERSION display Date: Mon, 18 Jul 2022 12:43:52 +0300 Message-Id: <20220718094352.9834-1-aladyshev22@gmail.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,aladyshev22@gmail.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1658137450; bh=5TPXSV/hPrQdQOWRGsAR6eRyVW2tCXYVdhdLKV9uXIQ=; h=Cc:Date:From:Reply-To:Subject:To; b=mi0UEz1syAMMhk2GjC1gogLuSwp7nLCw3M/HXepYNMVZU29HaLgacMX9F03Exmtv2Ex SLOEerdI/rTPzfr89s/r+K3yhW1bURZfNjFt6kWvaXDgs98hq3FAFzVknsoXPSgdtDWL/ OqpL6Wo3k/Z+zZ5BlUnqIqoe2IO7d2aP4MU= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1658137452390100003 Content-Type: text/plain; charset="utf-8" - Correct typo in print statement, - "BuildNumber" field is UINT16, therefore it needs "0x%04X" format modifier, - "VersionString" field is CHAR16, therefore the input data should be processed to be displayed with "%s" printf modifier. Signed-off-by: Konstantin Aladyshev Reviewed-by: Bob Feng --- BaseTools/Source/C/VolInfo/VolInfo.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/BaseTools/Source/C/VolInfo/VolInfo.c b/BaseTools/Source/C/VolI= nfo/VolInfo.c index 8b6fcffa48..ed56587058 100644 --- a/BaseTools/Source/C/VolInfo/VolInfo.c +++ b/BaseTools/Source/C/VolInfo/VolInfo.c @@ -1676,6 +1676,7 @@ Returns: CHAR8 *ToolInputFileName; CHAR8 *ToolOutputFileName; CHAR8 *UIFileName; + CHAR8 *VersionString; =20 ParsedLength =3D 0; ToolInputFileName =3D NULL; @@ -1816,8 +1817,14 @@ Returns: break; =20 case EFI_SECTION_VERSION: - printf (" Build Number: 0x%02X\n", *(UINT16 *)(Ptr + SectionHeader= Len)); - printf (" Version Strg: %s\n", (char*) (Ptr + SectionHeaderLen + s= izeof (UINT16))); + printf (" Build Number: 0x%04X\n", *(UINT16 *)(Ptr + SectionHeader= Len)); + VersionString =3D (CHAR8 *) malloc (UnicodeStrLen (((EFI_VERSION_SEC= TION *) Ptr)->VersionString) + 1); + if (VersionString =3D=3D NULL) { + Error (NULL, 0, 4001, "Resource", "memory cannot be allocated!"); + return EFI_OUT_OF_RESOURCES; + } + Unicode2AsciiString (((EFI_VERSION_SECTION *) Ptr)->VersionString, V= ersionString); + printf (" Version String: %s\n", VersionString); break; =20 case EFI_SECTION_COMPRESSION: --=20 2.25.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#91443): https://edk2.groups.io/g/devel/message/91443 Mute This Topic: https://groups.io/mt/92454946/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-