Merge branch 'release/202302' into codeql_fixes_2

microsoft · Jul 19, 2023 · e5e2c63 · e5e2c63
2 parents e2ba6a6 + 4148c64
commit e5e2c63
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.c
@@ -396,7 +396,7 @@ UsbParseConfigDesc (
 
     if (Setting == NULL) {
       DEBUG ((DEBUG_ERROR, "UsbParseConfigDesc: warning: failed to get interface setting, stop parsing now.\n"));
-      goto ON_ERROR;  // MU_CHANGE
+      break;
     } else if (Setting->Desc.InterfaceNumber >= NumIf) {
       DEBUG ((DEBUG_ERROR, "UsbParseConfigDesc: malformatted interface descriptor\n"));
 

diff --git a/pip-requirements.txt b/pip-requirements.txt
@@ -13,7 +13,7 @@
 ##
 
 edk2-pytool-library~=0.15.3 # MU_CHANGE
-edk2-pytool-extensions~=0.23.8 # MU_CHANGE
+edk2-pytool-extensions~=0.23.9 # MU_CHANGE
 edk2-basetools==0.1.49
 antlr4-python3-runtime==4.13.0
 regex