From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.40,417,1496127600"; d="scan'208";a="1155825266" 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 From: Yonghong Zhu To: edk2-devel@lists.01.org Cc: chenbo@pdx.edu, Liming Gao 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: [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: , X-List-Received-Date: Thu, 27 Jul 2017 01:41:32 -0000 Fixes: https://bugzilla.tianocore.org/show_bug.cgi?id=533 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/Source/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 := EFILDR_HEADER EFILDR_IMAGE + + The order of EFILDR_IMAGE is same as the order of placing PeImageFileContent. -Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at http://opensource.org/licenses/bsd-license.php @@ -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_VERSION, 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 EFILDR image with Efi loader header.\n"); } EFI_STATUS CountVerboseLevel ( @@ -219,11 +219,11 @@ Returns: if ((strlen(argv[0]) >= 2 && argv[0][0] == '-' && (argv[0][1] == 'v' || argv[0][1] == 'V')) || (stricmp (argv[0], "--verbose") == 0)) { VerboseLevel = 1; if (strlen(argv[0]) > 2) { Status = CountVerboseLevel (&argv[0][2], strlen(argv[0]) - 2, &VerboseLevel); 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; } } argc --; -- 2.6.1.windows.1