From mboxrd@z Thu Jan 1 00:00:00 1970 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 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=SUIB9HUG; spf=pass (domain: gmail.com, ip: 209.85.167.51, mailfrom: aladyshev22@gmail.com) Received: by mail-lf1-f51.google.com with SMTP id e28so18336227lfj.4 for ; Mon, 18 Jul 2022 02:44:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ChJM5ZLeVN3KonFDm3/pj0ExrkKVe1XU57446277zsU=; b=SUIB9HUGGcIPoUDsPUbrt74AzxM1Bb3AnBcJ6Cy5qrp7JZMshnNUbwrdpbJlV0Ta3n oNkJzz9SI0A2C9lDZahMhTiIhu29nrjYwVYRsWTxW8/rlmfXrPNLHX+IvtPbcx49dDrY HnfSD9SwrmMNAg1h11+miyuc4fcUtXSzBMZi253xyNdW9N7SDxHK8773/4ai5RZuPDc5 L4h9yi6JmCxvOftzqsQeucyTZYOJJxODr42nYvn2yYUpssIRJADJSiv4I85TU3esvF3i mQ+UBpFTgVfoO1Sx8IOqkwFN6Zwr1Ml0wleOuatgyzxfQK8gsZAf1lqkbYxR8o6o+YHp c81w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ChJM5ZLeVN3KonFDm3/pj0ExrkKVe1XU57446277zsU=; b=fNH8qP3pVWhu7MbHBVFj412ZMQsk2pUOJzU9Jg2hjTB548SmiOPqtQJvi52NketQsV fr1U6s3yhuEOCTQ8PHSKABBa0kPqXXLHTRvSZOEt16KA0cQ4mdtEUbVsKZCDwYvNLW/P mJPxvaSYOd/dMFyY0PB9SAHxub4oeqE9KF0Lilu7Skmz74ImRVrqY0zI07d02GhcFGyZ WZ7XUOJQpaeaGDOAU33sTT0YS4K5fQl1cGsCXXV3sXymwZWQLRzwpi3WuIaVGdWl5cvf iSJ7uoXSPFFGVyoTKG98nlg9DmtaheAzv2vqmUA+B363QG34zAFPVR+hRUs33MdVeFXA i4Ww== X-Gm-Message-State: AJIora+yehx7F3Y3WwrNvEQR+p6/A8qWgOQB7WWauGwLS9QaEiRrHCiO RL+Bom2xk442JwIYLPIBr3eSTFuQuYhrGA== 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) Return-Path: 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: [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> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable - 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 --- 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;=0D CHAR8 *ToolOutputFileName;=0D CHAR8 *UIFileName;=0D + CHAR8 *VersionString;=0D =0D ParsedLength =3D 0;=0D ToolInputFileName =3D NULL;=0D @@ -1816,8 +1817,14 @@ Returns: break;=0D =0D case EFI_SECTION_VERSION:=0D - printf (" Build Number: 0x%02X\n", *(UINT16 *)(Ptr + SectionHeader= Len));=0D - printf (" Version Strg: %s\n", (char*) (Ptr + SectionHeaderLen + s= izeof (UINT16)));=0D + printf (" Build Number: 0x%04X\n", *(UINT16 *)(Ptr + SectionHeader= Len));=0D + VersionString =3D (CHAR8 *) malloc (UnicodeStrLen (((EFI_VERSION_SEC= TION *) Ptr)->VersionString) + 1);=0D + if (VersionString =3D=3D NULL) {=0D + Error (NULL, 0, 4001, "Resource", "memory cannot be allocated!");= =0D + return EFI_OUT_OF_RESOURCES;=0D + }=0D + Unicode2AsciiString (((EFI_VERSION_SECTION *) Ptr)->VersionString, V= ersionString);=0D + printf (" Version String: %s\n", VersionString);=0D break;=0D =0D case EFI_SECTION_COMPRESSION:=0D --=20 2.25.1