Initialize the local variable before refer to them.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10577 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
lgao4 2010-06-12 03:14:26 +00:00
parent cda8ba5ed7
commit 0ccabf7bab
4 changed files with 20 additions and 9 deletions

View File

@ -188,6 +188,7 @@ Returns:
// //
// For now, allocate an arbitrarily long buffer // For now, allocate an arbitrarily long buffer
// //
BufferLen = 0;
Buffer = EfiLibAllocateZeroPool (0x10000); Buffer = EfiLibAllocateZeroPool (0x10000);
if (Buffer == NULL) { if (Buffer == NULL) {
return 0; return 0;
@ -428,14 +429,15 @@ Returns:
Handle = gST->ConsoleOutHandle; Handle = gST->ConsoleOutHandle;
GraphicsOutput = NULL;
UgaDraw = NULL;
Status = gBS->HandleProtocol ( Status = gBS->HandleProtocol (
Handle, Handle,
&gEfiGraphicsOutputProtocolGuid, &gEfiGraphicsOutputProtocolGuid,
(VOID**)&GraphicsOutput (VOID**)&GraphicsOutput
); );
UgaDraw = NULL; if (EFI_ERROR (Status) || (GraphicsOutput == NULL)) {
if (EFI_ERROR (Status)) {
GraphicsOutput = NULL; GraphicsOutput = NULL;
Status = gBS->HandleProtocol ( Status = gBS->HandleProtocol (

View File

@ -155,6 +155,7 @@ Returns:
// //
// For now, allocate an arbitrarily long buffer // For now, allocate an arbitrarily long buffer
// //
BufferLen = 0;
Buffer = EfiLibAllocateZeroPool (0x10000); Buffer = EfiLibAllocateZeroPool (0x10000);
if (Buffer == NULL) { if (Buffer == NULL) {
return 0; return 0;
@ -394,14 +395,15 @@ Returns:
Handle = gST->ConsoleOutHandle; Handle = gST->ConsoleOutHandle;
GraphicsOutput = NULL;
UgaDraw = NULL;
Status = gBS->HandleProtocol ( Status = gBS->HandleProtocol (
Handle, Handle,
&gEfiGraphicsOutputProtocolGuid, &gEfiGraphicsOutputProtocolGuid,
(VOID **) &GraphicsOutput (VOID **) &GraphicsOutput
); );
UgaDraw = NULL; if (EFI_ERROR (Status) || (GraphicsOutput == NULL)) {
if (EFI_ERROR (Status)) {
GraphicsOutput = NULL; GraphicsOutput = NULL;
Status = gBS->HandleProtocol ( Status = gBS->HandleProtocol (
@ -410,7 +412,7 @@ Returns:
(VOID **) &UgaDraw (VOID **) &UgaDraw
); );
if (EFI_ERROR (Status) || (UgaDraw != NULL)) { if (EFI_ERROR (Status) || (UgaDraw == NULL)) {
return 0; return 0;
} }
} }
@ -422,7 +424,7 @@ Returns:
(VOID **) &Sto (VOID **) &Sto
); );
if (EFI_ERROR (Status) || (Sto != NULL)) { if (EFI_ERROR (Status) || (Sto == NULL)) {
return 0; return 0;
} }

View File

@ -155,7 +155,7 @@ GlueMakeTable (
// //
// TableBits should not be greater than 16. // TableBits should not be greater than 16.
// //
if (TableBits >= (sizeof (Count)/sizeof (UINT16))) { if (TableBits > 16) {
return (UINT16) BAD_TABLE; return (UINT16) BAD_TABLE;
} }
@ -170,7 +170,7 @@ GlueMakeTable (
// //
// Count array index should not be greater than or equal to its size. // Count array index should not be greater than or equal to its size.
// //
if (BitLen[Index] < (sizeof (Count)/sizeof (UINT16))) { if (BitLen[Index] <= 16) {
Count[BitLen[Index]]++; Count[BitLen[Index]]++;
} else { } else {
return (UINT16) BAD_TABLE; return (UINT16) BAD_TABLE;

View File

@ -1,6 +1,6 @@
/*++ /*++
Copyright (c) 2004, Intel Corporation. All rights reserved.<BR> Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -42,6 +42,7 @@ Returns:
{ {
UINT8 Buffer; UINT8 Buffer;
Buffer = 0;
EfiIoRead (EfiCpuIoWidthUint8, Address, 1, &Buffer); EfiIoRead (EfiCpuIoWidthUint8, Address, 1, &Buffer);
return Buffer; return Buffer;
} }
@ -65,6 +66,7 @@ Returns:
{ {
UINT16 Buffer; UINT16 Buffer;
Buffer = 0;
EfiIoRead (EfiCpuIoWidthUint16, Address, 1, &Buffer); EfiIoRead (EfiCpuIoWidthUint16, Address, 1, &Buffer);
return Buffer; return Buffer;
} }
@ -88,6 +90,7 @@ Returns:
{ {
UINT32 Buffer; UINT32 Buffer;
Buffer = 0;
EfiIoRead (EfiCpuIoWidthUint32, Address, 1, &Buffer); EfiIoRead (EfiCpuIoWidthUint32, Address, 1, &Buffer);
return Buffer; return Buffer;
} }
@ -177,6 +180,7 @@ Returns:
{ {
UINT8 Buffer; UINT8 Buffer;
Buffer = 0;
EfiMemRead (EfiCpuIoWidthUint8, Address, 1, &Buffer); EfiMemRead (EfiCpuIoWidthUint8, Address, 1, &Buffer);
return Buffer; return Buffer;
} }
@ -200,6 +204,7 @@ Returns:
{ {
UINT16 Buffer; UINT16 Buffer;
Buffer = 0;
EfiMemRead (EfiCpuIoWidthUint16, Address, 1, &Buffer); EfiMemRead (EfiCpuIoWidthUint16, Address, 1, &Buffer);
return Buffer; return Buffer;
} }
@ -223,6 +228,7 @@ Returns:
{ {
UINT32 Buffer; UINT32 Buffer;
Buffer = 0;
EfiMemRead (EfiCpuIoWidthUint32, Address, 1, &Buffer); EfiMemRead (EfiCpuIoWidthUint32, Address, 1, &Buffer);
return Buffer; return Buffer;
} }
@ -246,6 +252,7 @@ Returns:
{ {
UINT64 Buffer; UINT64 Buffer;
Buffer = 0;
EfiMemRead (EfiCpuIoWidthUint64, Address, 1, &Buffer); EfiMemRead (EfiCpuIoWidthUint64, Address, 1, &Buffer);
return Buffer; return Buffer;
} }