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

Merge branch 'master' of https://github.com/tianocore/edk2

Browse Source
This commit is contained in:
Jaben Carsey
2016-02-10 08:56:33 -08:00
parent 2dda8a1232 7d0f92e8fd
commit 3a01358bdb
26 changed files with 40 additions and 3703 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
ShellPkg/Library/UefiShellLib/UefiShellLib.c
View File

@ -4176,27 +4176,43 @@ ShellFileHandleReadLine(
//
// if we have space save it...
//
if ((CountSoFar+1)*sizeof(CHAR16) < *Size){
if ((CountSoFar + 1) * CharSize < *Size){
ASSERT(Buffer != NULL);
((CHAR16*)Buffer)[CountSoFar] = CharBuffer;
((CHAR16*)Buffer)[CountSoFar+1] = CHAR_NULL;
if (*Ascii) {
((CHAR8*)Buffer)[CountSoFar] = (CHAR8) CharBuffer;
((CHAR8*)Buffer)[CountSoFar+1] = '\0';
}
else {
((CHAR16*)Buffer)[CountSoFar] = CharBuffer;
((CHAR16*)Buffer)[CountSoFar+1] = CHAR_NULL;
}
}
}
//
// if we ran out of space tell when...
//
if ((CountSoFar+1)*sizeof(CHAR16) > *Size){
*Size = (CountSoFar+1)*sizeof(CHAR16);
if (!Truncate) {
gEfiShellProtocol->SetFilePosition(Handle, OriginalFilePosition);
} else {
DEBUG((DEBUG_WARN, "The line was truncated in ShellFileHandleReadLine"));
if (Status != EFI_END_OF_FILE){
if ((CountSoFar + 1) * CharSize > *Size){
*Size = (CountSoFar + 1) * CharSize;
if (!Truncate) {
gEfiShellProtocol->SetFilePosition(Handle, OriginalFilePosition);
} else {
DEBUG((DEBUG_WARN, "The line was truncated in ShellFileHandleReadLine"));
}
return (EFI_BUFFER_TOO_SMALL);
}
if (*Ascii) {
if (CountSoFar && ((CHAR8*)Buffer)[CountSoFar - 1] == '\r') {
((CHAR8*)Buffer)[CountSoFar - 1] = '\0';
}
}
else {
if (CountSoFar && Buffer[CountSoFar - 1] == L'\r') {
Buffer[CountSoFar - 1] = CHAR_NULL;
}
}
return (EFI_BUFFER_TOO_SMALL);
}
while(Buffer[StrLen(Buffer)-1] == L'\r') {
Buffer[StrLen(Buffer)-1] = CHAR_NULL;
}
return (Status);