From: Michael Kinney <michael.d.kinney@intel.com>
Date: Sat, 12 Dec 2015 19:28:21 +0000 (+0000)
Subject: ShellPkg/Shell - Fix ASSERT() when FvSimpleFileSystemDxe is used
X-Git-Tag: edk2-stable201903~8313
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=898378c2be038bfbee21a8dd284a3dc3c5bb8f5e

ShellPkg/Shell - Fix ASSERT() when FvSimpleFileSystemDxe is used

When the FvSimpleFileSystemDxe module is included in a platform,
Simple File System Protocols are produced for firmware volumes(FV)
that do not have the same style device paths as file systems with
file names.  The ShellPkg has an assumption that the device path
contains device path nodes of type MEDIA_FILEPATH_DP and generates
an ASSERT() if any other device path nodes are encountered.  This
change removes the ASSERT() condition and instead returns NULL that
means EfiShellGetFilePathFromDevicePath() can not convert the
device path nodes that represent the file path to a Unicode string.

Cc: Jaben Carsey <jaben.carsey@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Michael Kinney <michael.d.kinney@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@19228 6f19259b-4bc3-4df7-8a09-765794883524
---

diff --git a/ShellPkg/Application/Shell/ShellProtocol.c b/ShellPkg/Application/Shell/ShellProtocol.c
index 9c370ccef5..def3bd35c2 100644
--- a/ShellPkg/Application/Shell/ShellProtocol.c
+++ b/ShellPkg/Application/Shell/ShellProtocol.c
@@ -449,38 +449,37 @@ EfiShellGetFilePathFromDevicePath(
           ; FilePath = (FILEPATH_DEVICE_PATH*)NextDevicePathNode (&FilePath->Header)
          ){
         //
-        // all the rest should be file path nodes
+        // If any node is not a file path node, then the conversion can not be completed
         //
         if ((DevicePathType(&FilePath->Header) != MEDIA_DEVICE_PATH) ||
             (DevicePathSubType(&FilePath->Header) != MEDIA_FILEPATH_DP)) {
           FreePool(PathForReturn);
-          PathForReturn = NULL;
-          ASSERT(FALSE);
-        } else {
-          //
-          // append the path part onto the filepath.
-          //
-          ASSERT((PathForReturn == NULL && PathSize == 0) || (PathForReturn != NULL));
-
-          AlignedNode = AllocateCopyPool (DevicePathNodeLength(FilePath), FilePath);
-          ASSERT (AlignedNode != NULL);
-
-          // File Path Device Path Nodes 'can optionally add a "\" separator to
-          //  the beginning and/or the end of the Path Name string.'
-          // (UEFI Spec 2.4 section 9.3.6.4).
-          // If necessary, add a "\", but otherwise don't
-          // (This is specified in the above section, and also implied by the
-          //  UEFI Shell spec section 3.7)
-          if ((PathSize != 0)                        &&
-              (PathForReturn != NULL)                &&
-              (PathForReturn[PathSize - 1] != L'\\') &&
-              (AlignedNode->PathName[0]    != L'\\')) {
-            PathForReturn = StrnCatGrow (&PathForReturn, &PathSize, L"\\", 1);
-          }
+          return NULL;
+        }
 
-          PathForReturn = StrnCatGrow(&PathForReturn, &PathSize, AlignedNode->PathName, 0);
-          FreePool(AlignedNode);
+        //
+        // append the path part onto the filepath.
+        //
+        ASSERT((PathForReturn == NULL && PathSize == 0) || (PathForReturn != NULL));
+
+        AlignedNode = AllocateCopyPool (DevicePathNodeLength(FilePath), FilePath);
+        ASSERT (AlignedNode != NULL);
+
+        // File Path Device Path Nodes 'can optionally add a "\" separator to
+        //  the beginning and/or the end of the Path Name string.'
+        // (UEFI Spec 2.4 section 9.3.6.4).
+        // If necessary, add a "\", but otherwise don't
+        // (This is specified in the above section, and also implied by the
+        //  UEFI Shell spec section 3.7)
+        if ((PathSize != 0)                        &&
+            (PathForReturn != NULL)                &&
+            (PathForReturn[PathSize - 1] != L'\\') &&
+            (AlignedNode->PathName[0]    != L'\\')) {
+          PathForReturn = StrnCatGrow (&PathForReturn, &PathSize, L"\\", 1);
         }
+
+        PathForReturn = StrnCatGrow(&PathForReturn, &PathSize, AlignedNode->PathName, 0);
+        FreePool(AlignedNode);
       } // for loop of remaining nodes
     }
     if (PathForReturn != NULL) {