Append the terminating null character at the end of the string to avoid buffer overflow.
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Qiu Shumin <shumin.qiu@intel.com> Reviewed-by: Fu Siyuan <siyuan.fu@intel.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15888 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
@@ -60,7 +60,8 @@ PxeBcCheckPacket (
|
||||
if (Packet->OpCode == EFI_MTFTP4_OPCODE_ERROR) {
|
||||
Private->Mode.TftpErrorReceived = TRUE;
|
||||
Private->Mode.TftpError.ErrorCode = (UINT8) Packet->Error.ErrorCode;
|
||||
AsciiStrnCpy (Private->Mode.TftpError.ErrorString, (CHAR8 *) Packet->Error.ErrorMessage, 127);
|
||||
AsciiStrnCpy (Private->Mode.TftpError.ErrorString, (CHAR8 *) Packet->Error.ErrorMessage, PXE_MTFTP_ERROR_STRING_LENGTH);
|
||||
Private->Mode.TftpError.ErrorString[PXE_MTFTP_ERROR_STRING_LENGTH - 1] = '\0';
|
||||
}
|
||||
|
||||
if (Callback != NULL) {
|
||||
@@ -162,8 +163,9 @@ PxeBcTftpGetFileSize (
|
||||
AsciiStrnCpy (
|
||||
Private->Mode.TftpError.ErrorString,
|
||||
(CHAR8 *) Packet->Error.ErrorMessage,
|
||||
127
|
||||
PXE_MTFTP_ERROR_STRING_LENGTH
|
||||
);
|
||||
Private->Mode.TftpError.ErrorString[PXE_MTFTP_ERROR_STRING_LENGTH - 1] = '\0';
|
||||
}
|
||||
goto ON_ERROR;
|
||||
}
|
||||
|
@@ -1,7 +1,7 @@
|
||||
/** @file
|
||||
Mtftp routines for PxeBc.
|
||||
|
||||
Copyright (c) 2007 - 2009, Intel Corporation. All rights reserved.<BR>
|
||||
Copyright (c) 2007 - 2014, 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
|
||||
@@ -21,6 +21,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||
#define PXE_MTFTP_OPTION_MULTICAST_INDEX 3
|
||||
#define PXE_MTFTP_OPTION_MAXIMUM_INDEX 4
|
||||
|
||||
#define PXE_MTFTP_ERROR_STRING_LENGTH 127
|
||||
|
||||
|
||||
/**
|
||||
This function is to get size of a file by Tftp.
|
||||
|
Reference in New Issue
Block a user