Refine code to make code run more safely.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11583 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/OptionRomPkg/Application/BltLibSample/BltLibSample.c b/OptionRomPkg/Application/BltLibSample/BltLibSample.c
index 300b9ee117ab8074adaa396d1825238a9406ee17..29f270c3f49d57616ccbef5631ad83c417647fd7 100644 (file)
--- a/OptionRomPkg/Application/BltLibSample/BltLibSample.c
+++ b/OptionRomPkg/Application/BltLibSample/BltLibSample.c
@@ -40,7 +40,7 @@ Rand32 (
   )\r
 {\r
   UINTN    Found;\r
   )\r
 {\r
   UINTN    Found;\r

-  UINTN    Bits;\r
+  INTN     Bits;\r

   UINT64   Tsc1;\r
   UINT64   Tsc2;\r
   UINT64   TscBits;\r
   UINT64   Tsc1;\r
   UINT64   Tsc2;\r
   UINT64   TscBits;\r

diff --git a/OptionRomPkg/Library/FrameBufferBltLib/FrameBufferBltLib.c b/OptionRomPkg/Library/FrameBufferBltLib/FrameBufferBltLib.c
index cfd5212d482478eed64e68c986d11352f83fd0ed..2df840af15d8f5e4dfb673164400444537e9488c 100644 (file)
--- a/OptionRomPkg/Library/FrameBufferBltLib/FrameBufferBltLib.c
+++ b/OptionRomPkg/Library/FrameBufferBltLib/FrameBufferBltLib.c
@@ -66,7 +66,7 @@ ConfigurePixelBitMaskFormat (
   MergedMasks = (UINT32) (MergedMasks | Masks[3]);\r
 \r
   ASSERT (MergedMasks != 0);\r
   MergedMasks = (UINT32) (MergedMasks | Masks[3]);\r
 \r
   ASSERT (MergedMasks != 0);\r

-  mBltLibBytesPerPixel = (HighBitSet32 (MergedMasks) + 7) / 8;\r
+  mBltLibBytesPerPixel = (UINTN) ((HighBitSet32 (MergedMasks) + 7) / 8);\r

 \r
   DEBUG ((EFI_D_INFO, "Bytes per pixel: %d\n", mBltLibBytesPerPixel));\r
 \r
 \r
   DEBUG ((EFI_D_INFO, "Bytes per pixel: %d\n", mBltLibBytesPerPixel));\r
 \r