Changeset 39585 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Dec 12, 2011 3:35:46 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

75349

Message:

Removed assertion.

Location:

trunk/src/VBox/Main/src-client

Files:

• GuestCtrlImplDir.cpp (modified) (1 diff)
• GuestCtrlImplFile.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-client/GuestCtrlImplDir.cpp

@@ -494 +494 @@
         {
             int rc = VINF_SUCCESS;
-
-            Assert(stdOut.size());
-            const char *pszFsType = stdOut[0].GetString("ftype");
-            if (!pszFsType) /* Attribute missing? */
-                 rc = VERR_NOT_FOUND;
-            if (   RT_SUCCESS(rc)
-                && strcmp(pszFsType, "d")) /* Directory? */
+            if (stdOut.size())
             {
-                 rc = VERR_FILE_NOT_FOUND;
-                 /* This is not critical for Main, so don't set hr --
-                  * we will take care of rc then. */
+                const char *pszFsType = stdOut[0].GetString("ftype");
+                if (!pszFsType) /* Attribute missing? */
+                     rc = VERR_NOT_FOUND;
+                if (   RT_SUCCESS(rc)
+                    && strcmp(pszFsType, "d")) /* Directory? */
+                {
+                     rc = VERR_FILE_NOT_FOUND;
+                     /* This is not critical for Main, so don't set hr --
+                      * we will take care of rc then. */
+                }
+                if (   RT_SUCCESS(rc)
+                    && aObjInfo) /* Do we want object details? */
+                {
+                    hr = executeStreamQueryFsObjInfo(aDirectory, stdOut[0],
+                                                     aObjInfo, enmAddAttribs);
+                }
             }
-            if (   RT_SUCCESS(rc)
-                && aObjInfo) /* Do we want object details? */
-            {
-                hr = executeStreamQueryFsObjInfo(aDirectory, stdOut[0],
-                                                 aObjInfo, enmAddAttribs);
-            }
+            else
+                rc = VERR_NOT_FOUND;
 
             if (pRC)

trunk/src/VBox/Main/src-client/GuestCtrlImplFile.cpp

@@ -146 +146 @@
         {
             int rc = VINF_SUCCESS;
-            const char *pszFsType = stdOut[0].GetString("ftype");
-            if (!pszFsType) /* Attribute missing? */
+            if (stdOut.size())
+            {
+                const char *pszFsType = stdOut[0].GetString("ftype");
+                if (!pszFsType) /* Attribute missing? */
+                    rc = VERR_NOT_FOUND;
+                if (   RT_SUCCESS(rc)
+                    && strcmp(pszFsType, "-")) /* Regular file? */
+                {
+                    rc = VERR_FILE_NOT_FOUND;
+                    /* This is not critical for Main, so don't set hr --
+                     * we will take care of rc then. */
+                }
+                if (   RT_SUCCESS(rc)
+                    && aObjInfo) /* Do we want object details? */
+                {
+                    hr = executeStreamQueryFsObjInfo(aFile, stdOut[0],
+                                                     aObjInfo, enmAddAttribs);
+                }
+            }
+            else
                 rc = VERR_NOT_FOUND;
-            if (   RT_SUCCESS(rc)
-                && strcmp(pszFsType, "-")) /* Regular file? */
-            {
-                rc = VERR_FILE_NOT_FOUND;
-                /* This is not critical for Main, so don't set hr --
-                 * we will take care of rc then. */
-            }
-            if (   RT_SUCCESS(rc)
-                && aObjInfo) /* Do we want object details? */
-            {
-                hr = executeStreamQueryFsObjInfo(aFile, stdOut[0],
-                                                 aObjInfo, enmAddAttribs);
-            }
 
             if (pRC)