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

pointer verification (not NULL) and buffer overrun fixes.

Browse Source 
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11459 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
jcarsey
2011-03-30 19:33:03 +00:00
parent 6b825919f1
commit 33c031ee20
21 changed files with 338 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/FileBuffer.c
View File

@ -247,10 +247,10 @@ MoveLine (
// if > 0, the advance
//
if (Count <= 0) {
AbsCount = -Count;
AbsCount = (UINTN)ABS(Count);
Line = InternalEditorMiscLineRetreat (AbsCount,MainEditor.FileBuffer->CurrentLine,MainEditor.FileBuffer->ListHead);
} else {
Line = InternalEditorMiscLineAdvance (Count,MainEditor.FileBuffer->CurrentLine,MainEditor.FileBuffer->ListHead);
Line = InternalEditorMiscLineAdvance ((UINTN)Count,MainEditor.FileBuffer->CurrentLine,MainEditor.FileBuffer->ListHead);
}
return Line;
@ -317,7 +317,7 @@ FileBufferRestoreMousePosition (
CurrentLine = FileBuffer.CurrentLine;
Line = MoveLine (FRow - FileBuffer.FilePosition.Row);
if (FColumn > Line->Size) {
if (Line == NULL || FColumn > Line->Size) {
HasCharacter = FALSE;
}
@ -500,7 +500,7 @@ FileBufferPrintLine (
Limit = 0;
}
StrnCpy (PrintLine, Buffer, Limit > MainEditor.ScreenSize.Column ? MainEditor.ScreenSize.Column : Limit);
StrnCpy (PrintLine, Buffer, MIN(MIN(Limit,MainEditor.ScreenSize.Column), 200));
for (; Limit < MainEditor.ScreenSize.Column; Limit++) {
PrintLine[Limit] = L' ';
}
@ -1446,7 +1446,7 @@ FileBufferSave (
//
// if is the old file
//
if (StrCmp (FileName, FileBuffer.FileName) == 0) {
if (FileBuffer.FileName != NULL && StrCmp (FileName, FileBuffer.FileName) == 0) {
//
// file has not been modified
//
@ -2316,7 +2316,7 @@ FileBufferPageDown (
//
// if that line, is not that long, so move to the end of that line
//
if (FCol > Line->Size) {
if (Line != NULL && FCol > Line->Size) {
FCol = Line->Size + 1;
}
@ -2372,7 +2372,7 @@ FileBufferPageUp (
//
// if that line is not that long, so move to the end of that line
//
if (FCol > Line->Size) {
if (Line != NULL && FCol > Line->Size) {
FCol = Line->Size + 1;
}
@ -2650,10 +2650,10 @@ MoveCurrentLine (
UINTN AbsCount;
if (Count <= 0) {
AbsCount = -Count;
AbsCount = (UINTN)ABS(Count);
Line = InternalEditorMiscLineRetreat (AbsCount,MainEditor.FileBuffer->CurrentLine,MainEditor.FileBuffer->ListHead);
} else {
Line = InternalEditorMiscLineAdvance (Count,MainEditor.FileBuffer->CurrentLine,MainEditor.FileBuffer->ListHead);
Line = InternalEditorMiscLineAdvance ((UINTN)Count,MainEditor.FileBuffer->CurrentLine,MainEditor.FileBuffer->ListHead);
}
if (Line == NULL) {
@ -2720,7 +2720,7 @@ FileBufferMovePosition (
//
FileBuffer.FilePosition.Row = NewFilePosRow;
if (RowGap < 0) {
Abs = -RowGap;
Abs = (UINTN)ABS(RowGap);
FileBuffer.DisplayPosition.Row -= Abs;
} else {
FileBuffer.DisplayPosition.Row += RowGap;