From nobody Tue Feb 10 03:37:53 2026 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1501119819015119.92382613704774; Wed, 26 Jul 2017 18:43:39 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id E263C21D09190; Wed, 26 Jul 2017 18:41:32 -0700 (PDT) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 2C36D21D09189 for ; Wed, 26 Jul 2017 18:41:32 -0700 (PDT) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga105.jf.intel.com with ESMTP; 26 Jul 2017 18:43:35 -0700 Received: from shwdeopenpsi168.ccr.corp.intel.com ([10.239.158.121]) by orsmga001.jf.intel.com with ESMTP; 26 Jul 2017 18:43:34 -0700 X-Original-To: edk2-devel@lists.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.40,417,1496127600"; d="scan'208";a="1155825266" From: Yonghong Zhu To: edk2-devel@lists.01.org Date: Thu, 27 Jul 2017 09:42:31 +0800 Message-Id: <1501119752-3856-6-git-send-email-yonghong.zhu@intel.com> X-Mailer: git-send-email 2.6.1.windows.1 In-Reply-To: <1501119752-3856-1-git-send-email-yonghong.zhu@intel.com> References: <1501119752-3856-1-git-send-email-yonghong.zhu@intel.com> Subject: [edk2] [Patch 5/6] BaseTools/EfiLdrImage: Fix a segmentation fault from vfprintf() X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: chenbo@pdx.edu, Liming Gao MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Fixes: https://bugzilla.tianocore.org/show_bug.cgi?id=3D533 Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Yonghong Zhu --- BaseTools/Source/C/EfiLdrImage/EfiLdrImage.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/BaseTools/Source/C/EfiLdrImage/EfiLdrImage.c b/BaseTools/Sourc= e/C/EfiLdrImage/EfiLdrImage.c index a46ecf8..5368d22 100644 --- a/BaseTools/Source/C/EfiLdrImage/EfiLdrImage.c +++ b/BaseTools/Source/C/EfiLdrImage/EfiLdrImage.c @@ -4,11 +4,11 @@ This tool combines several PE Image files together using = following format denote FILE :=3D EFILDR_HEADER EFILDR_IMAGE + + The order of EFILDR_IMAGE is same as the order of placing PeImageFileConte= nt. =20 -Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials =20 are licensed and made available under the terms and conditions of the BSD = License =20 which accompanies this distribution. The full text of the license may be = found at =20 http://opensource.org/licenses/bsd-license.php = =20 =20 @@ -82,11 +82,11 @@ Usage ( VOID ) { printf ("Usage: EfiLdrImage -o OutImage LoaderImage PeImage1 PeImage2 ..= . PeImageN\n"); printf ("%s Version %d.%d Build %s\n", UTILITY_NAME, UTILITY_MAJOR_VERSI= ON, UTILITY_MINOR_VERSION, __BUILD_VERSION); - printf ("Copyright (c) 1999-2016 Intel Corporation. All rights reserved.= \n"); + printf ("Copyright (c) 1999-2017 Intel Corporation. All rights reserved.= \n"); printf ("\n The EfiLdrImage tool is used to combine PE files into EFILD= R image with Efi loader header.\n"); } =20 EFI_STATUS CountVerboseLevel ( @@ -219,11 +219,11 @@ Returns: if ((strlen(argv[0]) >=3D 2 && argv[0][0] =3D=3D '-' && (argv[0][1] = =3D=3D 'v' || argv[0][1] =3D=3D 'V')) || (stricmp (argv[0], "--verbose") = =3D=3D 0)) { VerboseLevel =3D 1; if (strlen(argv[0]) > 2) { Status =3D CountVerboseLevel (&argv[0][2], strlen(argv[0]) - 2, &V= erboseLevel); if (EFI_ERROR (Status)) { - Error (NULL, 0, 1003, "Invalid option value", argv[0]); + Error (NULL, 0, 1003, "Invalid option value", "%s", argv[0]); return STATUS_ERROR; =20 } } =20 argc --; --=20 2.6.1.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel