sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add the missing check for NULL pointer before use it.

Browse Source 
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10116 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
lgao4
2010-02-27 09:04:11 +00:00
parent 3978f5d92b
commit 771ececd12
7 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
MdeModulePkg/Universal/SetupBrowserDxe/Expression.c
View File

@@ -1729,6 +1729,7 @@ EvaluateExpression (
//
Status = GetValueByName (OpCode->VarStorage, OpCode->ValueName, &StrPtr);
if (!EFI_ERROR (Status)) {
ASSERT (StrPtr != NULL);
TempLength = StrLen (StrPtr);
if (OpCode->ValueWidth >= ((TempLength + 1) / 2)) {
Value->Type = OpCode->ValueType;
@@ -1740,7 +1741,7 @@ EvaluateExpression (
if ((Index & 1) == 0) {
TempBuffer [Index/2] = DigitUint8;
} else {
TempBuffer [Index/2] = (UINT8) ((DigitUint8 << 4) + TempStr [Index/2]);
TempBuffer [Index/2] = (UINT8) ((DigitUint8 << 4) + TempBuffer [Index/2]);
}
}
}

2
MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
View File

@@ -1174,6 +1174,7 @@ ParseOpCodes (
//
if (CurrentExpression == NULL && MapScopeDepth > 0) {
CurrentExpression = CreateExpression (CurrentForm);
ASSERT (MapExpressionList != NULL);
InsertTailList (MapExpressionList, &CurrentExpression->Link);
if (Scope == 0) {
SingleOpCodeExpression = TRUE;
@@ -2120,6 +2121,7 @@ ParseOpCodes (
//
Status = PopCurrentExpression ((VOID **) &CurrentExpression);
ASSERT_EFI_ERROR (Status);
ASSERT (MapScopeDepth > 0);
MapScopeDepth --;
break;

7
MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
View File

@@ -109,6 +109,8 @@ NewStrCat (
hit, then 2 Unicode character will consume an output storage
space with size of CHAR16 till a NARROW_CHAR is hit.
If String is NULL, then ASSERT ().
@param String The input string to be counted.
@return Storage space for the input string.
@@ -123,6 +125,11 @@ GetStringWidth (
UINTN Count;
UINTN IncrementValue;
ASSERT (String != NULL);
if (String == NULL) {
return 0;
}
Index = 0;
Count = 0;
IncrementValue = 1;

2
MdeModulePkg/Universal/SetupBrowserDxe/Ui.h
View File

@@ -623,6 +623,8 @@ ClearLines (
hit, then 2 Unicode character will consume an output storage
space with size of CHAR16 till a NARROW_CHAR is hit.
If String is NULL, then ASSERT ().
@param String The input string to be counted.
@return Storage space for the input string.