Changeset 32689 in vbox for trunk/src/VBox/HostServices

Timestamp:

Sep 22, 2010 9:58:02 AM (14 years ago)

Author:

vboxsync

Message:

Shared folders: don't abort the directory listing if an entry with an invalid encoding was found

File:

• trunk/src/VBox/HostServices/SharedFolders/vbsf.cpp (modified) (4 diffs)

trunk/src/VBox/HostServices/SharedFolders/vbsf.cpp

@@ -135 +135 @@
         goto end;
 
-    for(;;)
+    for (;;)
     {
         size_t cbDirEntrySize = cbDirEntry;
@@ -143 +143 @@
             break;
 
-        if (VINF_SUCCESS != rc && rc != VWRN_NO_DIRENT_INFO)
+        if (   rc != VINF_SUCCESS
+            && rc != VWRN_NO_DIRENT_INFO)
         {
             AssertFailed();
-            if (rc != VERR_NO_TRANSLATION)
-                break;
-            else
+            if (   rc == VERR_NO_TRANSLATION
+                || rc == VERR_INVALID_UTF8_ENCODING)
                 continue;
+            break;
         }
 
@@ -527 +528 @@
                 {
                     src++;
-                    for(;;)
+                    for (;;)
                     {
                         char *end = src;
@@ -1534 +1535 @@
             }
 
-            if (VINF_SUCCESS != rc && rc != VWRN_NO_DIRENT_INFO)
+            if (   rc != VINF_SUCCESS
+                && rc != VWRN_NO_DIRENT_INFO)
             {
                 AssertFailed();
-                if (rc != VERR_NO_TRANSLATION)
-                    break;
-                else
+                if (   rc == VERR_NO_TRANSLATION
+                    || rc == VERR_INVALID_UTF8_ENCODING)
                     continue;
+                break;
             }
         }