tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-04-08 17:05:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

ShellPkg/editor: Fix system hang when console max column > 200

Browse Source 
EditorClearLine() assumes the console max column is less than 200.
When the max column is bigger than 200, the code incorrectly
modifies the content out side of Line buffer.
It may cause system hang or reset.

The patch changes the function to print several times when
the max column is bigger than 200.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
This commit is contained in:
Ruiyu Ni 2017-10-19 14:14:33 +08:00
parent b9e5df4336
commit 1a421c2c17
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c
View File

@ -185,6 +185,7 @@ EditorClearLine (
IN UINTN LastRow
)
{
UINTN Col;
CHAR16 Line[200];
if (Row == 0) {
@ -193,22 +194,28 @@ EditorClearLine (
//
// prepare a blank line
// If max column is larger, split to multiple prints.
//
SetMem16(Line, LastCol*sizeof(CHAR16), L' ');
SetMem16 (Line, sizeof (Line), L' ');
Line[ARRAY_SIZE (Line) - 1] = CHAR_NULL;
if (Row == LastRow) {
for (Col = 1; Col <= LastCol; Col += ARRAY_SIZE (Line) - 1) {
if (Col + ARRAY_SIZE (Line) - 1 > LastCol) {
if (Row == LastRow) {
//
// if CHAR_NULL is still at position LastCol, it will cause first line error
//
Line[(LastCol % (ARRAY_SIZE (Line) - 1)) - 1] = CHAR_NULL;
} else {
Line[LastCol % (ARRAY_SIZE (Line) - 1)] = CHAR_NULL;
}
}
//
// if CHAR_NULL is still at position 80, it will cause first line error
// print out the blank line
//
Line[LastCol - 1] = CHAR_NULL;
} else {
Line[LastCol] = CHAR_NULL;
ShellPrintEx ((INT32) Col - 1, (INT32) Row - 1, Line);
}
//
// print out the blank line
//
ShellPrintEx (0, ((INT32)Row) - 1, Line);
}
/**