Changeset 90314 in vbox for trunk/src/VBox/Runtime/common/efi

Timestamp:

Jul 23, 2021 3:48:06 PM (4 years ago)

Author:

vboxsync

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

145871

Message:

Runtime/efivarstorevfs.cpp: Some fixes, bugref:9580

File:

• trunk/src/VBox/Runtime/common/efi/efivarstorevfs.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/common/efi/efivarstorevfs.cpp

@@ -1883 +1883 @@
     {
         for (uint32_t i = 0; i < pThis->cVars; i++)
+        {
             RTStrFree(pThis->paVars[i].pszName);
+            if (pThis->paVars[i].pvData)
+                RTMemFree(pThis->paVars[i].pvData);
+        }
 
         RTMemFree(pThis->paVars);
@@ -2089 +2093 @@
     if (   cbVarMax <= cbName
         || cbVarMax - cbName <= cbData)
-        return RTERRINFO_LOG_SET_F(pErrInfo, VERR_VFS_UNSUPPORTED_FORMAT, "Variable exceeds remaining space in store (cbName=%llu cbData=%llu cbVarMax=%llu)",
+        return RTERRINFO_LOG_SET_F(pErrInfo, VERR_VFS_UNSUPPORTED_FORMAT, "Variable exceeds remaining space in store (cbName=%u cbData=%u cbVarMax=%llu)",
                                    cbName, cbData, cbVarMax);
 
@@ -2146 +2150 @@
     PRTEFIVAR pVar = &pThis->paVars[pThis->cVars++];
     pVar->pVarStore  = pThis;
-    pVar->offVarData = offVar + sizeof(VarHdr) + RT_LE2H_U32(VarHdr.cbName);
+    if (RT_LE2H_U32(VarHdr.cbData))
+        pVar->offVarData = offVar + sizeof(VarHdr) + RT_LE2H_U32(VarHdr.cbName);
+    else
+        pVar->offVarData = 0;
     pVar->fAttr      = RT_LE2H_U32(VarHdr.fAttr);
     pVar->cMonotonic = RT_LE2H_U64(VarHdr.cMonotonic);