MdeModulePkg: Replace unsafe string functions.
Replace unsafe string functions with new added safe string functions. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Zhang Lubo <lubo.zhang@intel.com> Reviewed-by: Fu Siyuan <siyuan.fu@intel.com> Reviewed-by: Qiu Shumin <shumin.qiu@intel.com> Reviewed-by: Jaben Carsey <jaben.carsey@intel.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17881 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
/** @file
|
||||
PxeBc MTFTP functions.
|
||||
|
||||
Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
|
||||
Copyright (c) 2007 - 2015, 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
|
||||
@@ -60,7 +60,7 @@ 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, PXE_MTFTP_ERROR_STRING_LENGTH);
|
||||
AsciiStrnCpyS (Private->Mode.TftpError.ErrorString, PXE_MTFTP_ERROR_STRING_LENGTH, (CHAR8 *) Packet->Error.ErrorMessage, PXE_MTFTP_ERROR_STRING_LENGTH - 1);
|
||||
Private->Mode.TftpError.ErrorString[PXE_MTFTP_ERROR_STRING_LENGTH - 1] = '\0';
|
||||
}
|
||||
|
||||
@@ -135,13 +135,13 @@ PxeBcTftpGetFileSize (
|
||||
}
|
||||
|
||||
ReqOpt[0].OptionStr = (UINT8*)mMtftpOptions[PXE_MTFTP_OPTION_TSIZE_INDEX];
|
||||
UtoA10 (0, (CHAR8 *) OptBuf);
|
||||
UtoA10 (0, (CHAR8 *) OptBuf, PXE_MTFTP_OPTBUF_MAXNUM_INDEX);
|
||||
ReqOpt[0].ValueStr = OptBuf;
|
||||
|
||||
if (BlockSize != NULL) {
|
||||
ReqOpt[1].OptionStr = (UINT8*)mMtftpOptions[PXE_MTFTP_OPTION_BLKSIZE_INDEX];
|
||||
ReqOpt[1].ValueStr = ReqOpt[0].ValueStr + AsciiStrLen ((CHAR8 *) ReqOpt[0].ValueStr) + 1;
|
||||
UtoA10 (*BlockSize, (CHAR8 *) ReqOpt[1].ValueStr);
|
||||
UtoA10 (*BlockSize, (CHAR8 *) ReqOpt[1].ValueStr, PXE_MTFTP_OPTBUF_MAXNUM_INDEX - (AsciiStrLen ((CHAR8 *) ReqOpt[0].ValueStr) + 1));
|
||||
OptCnt++;
|
||||
}
|
||||
|
||||
@@ -160,10 +160,11 @@ PxeBcTftpGetFileSize (
|
||||
if (Status == EFI_TFTP_ERROR) {
|
||||
Private->Mode.TftpErrorReceived = TRUE;
|
||||
Private->Mode.TftpError.ErrorCode = (UINT8) Packet->Error.ErrorCode;
|
||||
AsciiStrnCpy (
|
||||
Private->Mode.TftpError.ErrorString,
|
||||
(CHAR8 *) Packet->Error.ErrorMessage,
|
||||
PXE_MTFTP_ERROR_STRING_LENGTH
|
||||
AsciiStrnCpyS (
|
||||
Private->Mode.TftpError.ErrorString,
|
||||
PXE_MTFTP_ERROR_STRING_LENGTH,
|
||||
(CHAR8 *) Packet->Error.ErrorMessage,
|
||||
PXE_MTFTP_ERROR_STRING_LENGTH - 1
|
||||
);
|
||||
Private->Mode.TftpError.ErrorString[PXE_MTFTP_ERROR_STRING_LENGTH - 1] = '\0';
|
||||
}
|
||||
@@ -261,7 +262,7 @@ PxeBcTftpReadFile (
|
||||
|
||||
ReqOpt[0].OptionStr = (UINT8*) mMtftpOptions[PXE_MTFTP_OPTION_BLKSIZE_INDEX];
|
||||
ReqOpt[0].ValueStr = OptBuf;
|
||||
UtoA10 (*BlockSize, (CHAR8 *) ReqOpt[0].ValueStr);
|
||||
UtoA10 (*BlockSize, (CHAR8 *) ReqOpt[0].ValueStr, PXE_MTFTP_OPTBUF_MAXNUM_INDEX);
|
||||
OptCnt++;
|
||||
}
|
||||
|
||||
@@ -344,7 +345,7 @@ PxeBcTftpWriteFile (
|
||||
|
||||
ReqOpt[0].OptionStr = (UINT8*) mMtftpOptions[PXE_MTFTP_OPTION_BLKSIZE_INDEX];
|
||||
ReqOpt[0].ValueStr = OptBuf;
|
||||
UtoA10 (*BlockSize, (CHAR8 *) ReqOpt[0].ValueStr);
|
||||
UtoA10 (*BlockSize, (CHAR8 *) ReqOpt[0].ValueStr, PXE_MTFTP_OPTBUF_MAXNUM_INDEX);
|
||||
OptCnt++;
|
||||
}
|
||||
|
||||
@@ -418,7 +419,7 @@ PxeBcTftpReadDirectory (
|
||||
|
||||
ReqOpt[0].OptionStr = (UINT8*) mMtftpOptions[PXE_MTFTP_OPTION_BLKSIZE_INDEX];
|
||||
ReqOpt[0].ValueStr = OptBuf;
|
||||
UtoA10 (*BlockSize, (CHAR8 *) ReqOpt[0].ValueStr);
|
||||
UtoA10 (*BlockSize, (CHAR8 *) ReqOpt[0].ValueStr, PXE_MTFTP_OPTBUF_MAXNUM_INDEX);
|
||||
OptCnt++;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user