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

ShellPkg: Fix conditionally uninitialized variables

Browse Source 
Fixes CodeQL alerts for CWE-457:
https://cwe.mitre.org/data/definitions/457.html

Cc: Erich McMillan <emcmillan@microsoft.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Michael Kubacki <mikuback@linux.microsoft.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Zhichao Gao <zhichao.gao@intel.com>
Co-authored-by: Erich McMillan <emcmillan@microsoft.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
Reviewed-by: Zhichao Gao <zhichao.gao@intel.com>
Reviewed-by: Oliver Smith-Denny <osd@smith-denny.com>
This commit is contained in:
Michael Kubacki
2022-11-08 15:35:39 -05:00
committed by mergify[bot]
parent 7dc182ed1e
commit 11dd44dfbe
8 changed files with 108 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ShellPkg/Library/UefiShellDriver1CommandsLib/DrvDiag.c
View File

@ -438,25 +438,22 @@ ShellCommandRunDrvDiag (
ControllerHandleStr = ShellCommandLineGetRawValue (Package, 2);
ChildHandleStr = ShellCommandLineGetRawValue (Package, 3);
if (DriverHandleStr == NULL) {
Handle1 = NULL;
} else {
ShellConvertStringToUint64 (DriverHandleStr, &Intermediate, TRUE, FALSE);
if ((DriverHandleStr != NULL) && !EFI_ERROR (ShellConvertStringToUint64 (DriverHandleStr, &Intermediate, TRUE, FALSE))) {
Handle1 = ConvertHandleIndexToHandle ((UINTN)Intermediate);
} else {
Handle1 = NULL;
}
if (ControllerHandleStr == NULL) {
Handle2 = NULL;
} else {
ShellConvertStringToUint64 (ControllerHandleStr, &Intermediate, TRUE, FALSE);
if ((ControllerHandleStr != NULL) && !EFI_ERROR (ShellConvertStringToUint64 (ControllerHandleStr, &Intermediate, TRUE, FALSE))) {
Handle2 = ConvertHandleIndexToHandle ((UINTN)Intermediate);
} else {
Handle2 = NULL;
}
if (ChildHandleStr == NULL) {
Handle3 = NULL;
} else {
ShellConvertStringToUint64 (ChildHandleStr, &Intermediate, TRUE, FALSE);
if ((ChildHandleStr != NULL) && !EFI_ERROR (ShellConvertStringToUint64 (ChildHandleStr, &Intermediate, TRUE, FALSE))) {
Handle3 = ConvertHandleIndexToHandle ((UINTN)Intermediate);
} else {
Handle3 = NULL;
}
Status = DoDiagnostics (