Revision: 17847
http://sourceforge.net/p/edk2/code/17847
Author: dandanbi
Date: 2015-07-07 04:37:07 +0000 (Tue, 07 Jul 2015)
Log Message:
-----------
MdeModulePkg:Modify the incorrect DestStr length in safe string functions
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Dandan Bi <[email protected]>
Reviewed-by: Eric Dong <[email protected]>
Reviewed-by: Liming Gao <[email protected]>
Modified Paths:
--------------
trunk/edk2/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c
trunk/edk2/MdeModulePkg/Universal/HiiDatabaseDxe/String.c
Modified: trunk/edk2/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c
===================================================================
--- trunk/edk2/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c 2015-07-07
03:05:18 UTC (rev 17846)
+++ trunk/edk2/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c 2015-07-07
04:37:07 UTC (rev 17847)
@@ -1182,7 +1182,7 @@
}
FontInfo->FontStyle = FontPkgHdr->FontStyle;
FontInfo->FontSize = FontPkgHdr->Cell.Height;
- StrCpyS (FontInfo->FontName, sizeof (FontInfo->FontName) / sizeof (CHAR16),
FontPkgHdr->FontFamily);
+ StrCpyS (FontInfo->FontName, (FontInfoSize -
OFFSET_OF(EFI_FONT_INFO,FontName)) / sizeof (CHAR16), FontPkgHdr->FontFamily);
if (IsFontInfoExisted (Private, FontInfo, NULL, NULL, NULL)) {
Status = EFI_UNSUPPORTED;
Modified: trunk/edk2/MdeModulePkg/Universal/HiiDatabaseDxe/String.c
===================================================================
--- trunk/edk2/MdeModulePkg/Universal/HiiDatabaseDxe/String.c 2015-07-07
03:05:18 UTC (rev 17846)
+++ trunk/edk2/MdeModulePkg/Universal/HiiDatabaseDxe/String.c 2015-07-07
04:37:07 UTC (rev 17847)
@@ -1333,7 +1333,7 @@
StringPackage->StringPkgHdr->StringInfoOffset = HeaderSize;
CopyMem (StringPackage->StringPkgHdr->LanguageWindow, mLanguageWindow, 16
* sizeof (CHAR16));
StringPackage->StringPkgHdr->LanguageName = 1;
- AsciiStrCpyS (StringPackage->StringPkgHdr->Language,
sizeof(StringPackage->StringPkgHdr->Language) / sizeof (CHAR8), (CHAR8 *)
Language);
+ AsciiStrCpyS (StringPackage->StringPkgHdr->Language, (HeaderSize -
OFFSET_OF(EFI_HII_STRING_PACKAGE_HDR,Language)) / sizeof (CHAR8), (CHAR8 *)
Language);
//
// Calculate the length of the string blocks, including string block to
record
------------------------------------------------------------------------------
Don't Limit Your Business. Reach for the Cloud.
GigeNET's Cloud Solutions provide you with the tools and support that
you need to offload your IT needs and focus on growing your business.
Configured For All Businesses. Start Your Cloud Today.
https://www.gigenetcloud.com/
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
