From: Yonghong Zhu <yonghong.zhu@intel.com>
To: edk2-devel@lists.01.org
Cc: chenbo@pdx.edu, Liming Gao <liming.gao@intel.com>
Subject: [Patch 6/6] BaseTools/GenCrc32: Fix a bug to hand empty file for decode
Date: Thu, 27 Jul 2017 09:42:32 +0800 [thread overview]
Message-ID: <1501119752-3856-7-git-send-email-yonghong.zhu@intel.com> (raw)
In-Reply-To: <1501119752-3856-1-git-send-email-yonghong.zhu@intel.com>
Fixes: https://bugzilla.tianocore.org/show_bug.cgi?id=535
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
---
BaseTools/Source/C/GenCrc32/GenCrc32.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/BaseTools/Source/C/GenCrc32/GenCrc32.c b/BaseTools/Source/C/GenCrc32/GenCrc32.c
index e1e11c6..5153587 100644
--- a/BaseTools/Source/C/GenCrc32/GenCrc32.c
+++ b/BaseTools/Source/C/GenCrc32/GenCrc32.c
@@ -1,9 +1,9 @@
/** @file
Calculate Crc32 value and Verify Crc32 value for input data.
-Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>
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
@@ -78,11 +78,11 @@ Returns:
fprintf (stdout, "Usage: GenCrc32 -e|-d [options] <input_file>\n\n");
//
// Copyright declaration
//
- fprintf (stdout, "Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.\n\n");
+ fprintf (stdout, "Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.\n\n");
//
// Details Option
//
fprintf (stdout, "optional arguments:\n");
@@ -324,10 +324,14 @@ Returns:
VerboseMsg ("the size of the encoded file is %u bytes", (unsigned) FileSize + sizeof (UINT32));
} else {
//
// Verify Crc32 Value
//
+ if (FileSize < sizeof (UINT32)) {
+ Error (NULL, 0, 3000, "Invalid", "Input file is invalid!");
+ goto Finish;
+ }
Status = CalculateCrc32 (FileBuffer + sizeof (UINT32), FileSize - sizeof (UINT32), &Crc32Value);
if (Status != EFI_SUCCESS) {
Error (NULL, 0, 3000, "Invalid", "Calculate CRC32 value failed!");
goto Finish;
}
--
2.6.1.windows.1
next prev parent reply other threads:[~2017-07-27 1:41 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-27 1:42 [Patch 0/6] BaseTools: Fix some segmentation fault in Tools Yonghong Zhu
2017-07-27 1:42 ` [Patch 1/6] BaseTools/Split: Fix the segmentation fault in GetSplitValue() Yonghong Zhu
2017-07-27 1:42 ` [Patch 2/6] BaseTools/GenSec: Fix a segmentation fault in main() Yonghong Zhu
2017-07-27 1:42 ` [Patch 3/6] BaseTools/GenFfs: Fix a segmentation fault from vsprintf()/vfprintf() Yonghong Zhu
2017-07-27 1:42 ` [Patch 4/6] BaseTools/EfiRom: " Yonghong Zhu
2017-07-27 1:42 ` [Patch 5/6] BaseTools/EfiLdrImage: Fix a segmentation fault from vfprintf() Yonghong Zhu
2017-07-27 1:42 ` Yonghong Zhu [this message]
2017-08-01 2:41 ` [Patch 0/6] BaseTools: Fix some segmentation fault in Tools Gao, Liming
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1501119752-3856-7-git-send-email-yonghong.zhu@intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox