Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix an issue where an empty grid can cause a bad pointer dereference #8

Merged
merged 2 commits into from
Jan 2, 2019
+4 −1
Merged

Fix an issue where an empty grid can cause a bad pointer dereference #8

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e753ced
Fix an issue where an empty grid can cause a bad pointer dereference
joschock Jan 2, 2019
5321566
Merge branch 'release/201808' into personal/joschock/fp_fix
joschock Jan 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion MsGraphicsPkg/DisplayEngineDxe/FormDisplay.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1094,7 +1094,10 @@ CreateFormControls (IN FORM_DISPLAY_ENGINE_FORM *FormData,
// Signal that the current grid no longer has scope. Controls added from this point forward will be added
// directly to the canvas (unless another grid is created).
//
if (LocalGrid->m_GridInitialHeight != LocalGrid->m_GridCellHeight) {
if (LocalGrid == NULL) {
DEBUG ((DEBUG_ERROR, "ERROR [DE]: GridEndOp without valid StartGridOp\n"));
}
if (LocalGrid != NULL && LocalGrid->m_GridInitialHeight != LocalGrid->m_GridCellHeight) {
DEBUG ((DEBUG_ERROR, "ERROR [DE]: Grid elements larger than initial grid height. Correct VFR StartGridOp value.\r\n"));
}
GridScope = FALSE;
Expand Down