Check pointer before using it.

This commit is contained in:
jief 2020-03-05 09:42:50 +03:00
parent c6a59f85f9
commit f8bf956a39
2 changed files with 10 additions and 7 deletions

View File

@ -4432,7 +4432,7 @@ finish:
}
for (i = 0; i < ThemesNum; i++) {
if (StriCmp(GlobalConfig.Theme, ThemesList[i]) == 0) {
if (GlobalConfig.Theme && StriCmp(GlobalConfig.Theme, ThemesList[i]) == 0) {
OldChosenTheme = i;
break;
}

View File

@ -1080,12 +1080,15 @@ EFI_STATUS WaitForInputEventPoll(REFIT_MENU_SCREEN* ScreenPtr, UINTN TimeoutDefa
CheckSyncSound();
}
TimeoutRemain--;
if (Screen.mPointer->isAlive()) {
Screen.mPointer->UpdatePointer();
Status = Screen.mPointer->CheckMouseEvent(&Screen); //out: gItemID, gAction
if (Status != EFI_TIMEOUT) { //this check should return timeout if no mouse events occured
break;
}
if ( Screen.mPointer ) {
if (Screen.mPointer->isAlive()) {
Screen.mPointer->UpdatePointer();
Status = Screen.mPointer->CheckMouseEvent(&Screen); //out: gItemID, gAction
if (Status != EFI_TIMEOUT) { //this check should return timeout if no mouse events occured
break;
}
}
}
}
return Status;