Changeset 57641 in vbox for trunk/src/VBox/Runtime/common/crypto/pemfile.cpp

Timestamp:

Sep 7, 2015 1:00:03 PM (9 years ago)

Author:

vboxsync

Message:

RTCrPemFreeSections: pbData is always on the heap, so don't call RTFileReadAllFree any more.

File:

• trunk/src/VBox/Runtime/common/crypto/pemfile.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/common/crypto/pemfile.cpp

@@ -306 +306 @@
         pSectionHead = pSectionHead->pNext;
 
-        if (pFree->pMarker)
-        {
-            if (pFree->pbData)
-            {
-                RTMemFree(pFree->pbData);
-                pFree->pbData = NULL;
-                pFree->cbData = 0;
-            }
-
-            if (pFree->pszPreamble)
-            {
-                RTMemFree(pFree->pszPreamble);
-                pFree->pszPreamble = NULL;
-                pFree->cchPreamble = 0;
-            }
-        }
-        else
-        {
-            RTFileReadAllFree(pFree->pbData, pFree->cbData);
-            Assert(!pFree->pszPreamble);
-        }
-        pFree->pbData = NULL;
-        pFree->cbData = 0;
+        Assert(pFree->pMarker || !pFree->pszPreamble);
+
+        if (pFree->pbData)
+        {
+            RTMemFree(pFree->pbData);
+            pFree->pbData = NULL;
+            pFree->cbData = 0;
+        }
+
+        if (pFree->pszPreamble)
+        {
+            RTMemFree(pFree->pszPreamble);
+            pFree->pszPreamble = NULL;
+            pFree->cchPreamble = 0;
+        }
     }
     return VINF_SUCCESS;