Changeset 59554 in vbox

Timestamp:

Feb 2, 2016 2:01:52 AM (9 years ago)

Author:

vboxsync

Message:

RTManifestReadStandardEx: Don't assume spaces between the attribute name and the entry, i.e. SHA1(my.ovf)=digest

File:

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

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

@@ -1318 +1318 @@
          * Read the attribute name.
          */
+        char ch;
         const char * const pszAttr = psz;
         do
             psz++;
-        while (!RT_C_IS_BLANK(*psz) && *psz);
-        if (*psz)
+        while (!RT_C_IS_BLANK((ch = *psz)) && ch && ch != '(');
+        if (ch)
             *psz++ = '\0';
 
@@ -1328 +1329 @@
          * The entry name is enclosed in parenthesis and followed by a '='.
          */
-        psz = RTStrStripL(psz);
-        if (*psz != '(')
-        {
-            RTStrPrintf(pszErr, cbErr, "Expected '(' after %zu on line %u", psz - szLine, iLine);
-            return VERR_PARSE_ERROR;
-        }
-        const char * const pszName = ++psz;
-        while (*psz)
-        {
-            if (*psz == ')')
+        if (ch != '(')
+        {
+            psz = RTStrStripL(psz);
+            ch = *psz++;
+            if (ch != '(')
+            {
+                RTStrPrintf(pszErr, cbErr, "Expected '(' after %zu on line %u", psz - szLine - 1, iLine);
+                return VERR_PARSE_ERROR;
+            }
+        }
+        const char * const pszName = psz;
+        while ((ch = *psz) != '\0')
+        {
+            if (ch == ')')
             {
                 char *psz2 = RTStrStripL(psz + 1);