Remove ASSERT when failed to Get/Set “AttemptOrder” and “ClientId” variable.

[mirror_edk2.git] / NetworkPkg / IScsiDxe / IScsiDriver.c

diff --git a/NetworkPkg/IScsiDxe/IScsiDriver.c b/NetworkPkg/IScsiDxe/IScsiDriver.c
index 42ac8f0fe778e8b80c8d3335a10c6de0061d5ea3..8d1742455c2ca2cf17b0fe61ebea5ac0779f2965 100644 (file)
--- a/NetworkPkg/IScsiDxe/IScsiDriver.c
+++ b/NetworkPkg/IScsiDxe/IScsiDriver.c
@@ -651,7 +651,9 @@ IScsiStart (
                            &gIScsiConfigGuid,\r
                            &AttemptConfigOrderSize\r
                            );\r
-    ASSERT (AttemptConfigOrder != NULL);\r
+    if (AttemptConfigOrder == NULL) {\r
+      goto ON_ERROR;\r
+    }\r
     for (Index = 0; Index < AttemptConfigOrderSize / sizeof (UINT8); Index++) {\r
       if (AttemptConfigOrder[Index] == mPrivate->BootSelectedIndex ||\r
           AttemptConfigOrder[Index] == BootSelected) {\r
@@ -689,7 +691,9 @@ IScsiStart (
 \r
         goto ON_EXIT;\r
       } else {\r
-        ASSERT (AttemptConfigOrder[Index] == BootSelected);\r
+        if (AttemptConfigOrder[Index] != BootSelected) {\r
+          goto ON_ERROR;\r
+        }\r
         mPrivate->BootSelectedIndex = BootSelected;\r
         //\r
         // Clear the resource in ExistPrivate.\r