Changeset 68918 in vbox for trunk/src/VBox/Runtime/common/checksum/manifest2.cpp

Timestamp:

Sep 28, 2017 4:30:45 PM (7 years ago)

Author:

vboxsync

Message:

Main,iprt: Don't fail an import just because the manifest contains more entries than what we processed during the import.

File:

• trunk/src/VBox/Runtime/common/checksum/manifest2.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/common/checksum/manifest2.cpp

@@ -554 +554 @@
     if (!pEntry2)
     {
-        RTStrPrintf(pEquals->pszError, pEquals->cbError, "'%s' not found in the 2nd manifest", pEntry1->StrCore.pszString);
-        return VERR_NOT_EQUAL;
+        if (!(pEquals->fFlags & RTMANIFEST_EQUALS_IGN_MISSING_ENTRIES_2ND))
+        {
+            RTStrPrintf(pEquals->pszError, pEquals->cbError, "'%s' not found in the 2nd manifest", pEntry1->StrCore.pszString);
+            return VERR_NOT_EQUAL;
+        }
+        pEntry1->fVisited = true;
+        return VINF_SUCCESS;
     }
 
@@ -590 +595 @@
         AssertReturn(pThis2->u32Magic == RTMANIFEST_MAGIC, VERR_INVALID_HANDLE);
     }
-    AssertReturn(!(fFlags & ~(RTMANIFEST_EQUALS_IGN_MISSING_ATTRS)), VERR_INVALID_PARAMETER);
+    AssertReturn(!(fFlags & ~RTMANIFEST_EQUALS_VALID_MASK), VERR_INVALID_PARAMETER);
 
     /*