Changeset 64896 in vbox for trunk/src/VBox/Runtime/common/asn1

Timestamp:

Dec 16, 2016 1:44:38 AM (8 years ago)

Author:

vboxsync

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

112305

Message:

rtAsn1Core_EncodeWrite: Don't assert on uData.pv != NULL when cb is zero (dummy cores).

File:

• trunk/src/VBox/Runtime/common/asn1/asn1-ut-core.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/common/asn1/asn1-ut-core.cpp

@@ -201 +201 @@
 {
     int rc = RTAsn1EncodeWriteHeader(pThisCore, fFlags, pfnWriter, pvUser, pErrInfo);
-    if (RT_SUCCESS(rc) && rc != VINF_ASN1_NOT_ENCODED)
+    if (   RT_SUCCESS(rc)
+        && rc != VINF_ASN1_NOT_ENCODED)
     {
         Assert(!RTASN1CORE_IS_DUMMY(pThisCore));
-        AssertPtrReturn(pThisCore->uData.pv,
-                        RTErrInfoSetF(pErrInfo, VERR_ASN1_INVALID_DATA_POINTER,
-                                      "Invalid uData pointer %p for lone ASN.1 core with %#x bytes of content",
-                                      pThisCore->uData.pv, pThisCore->cb));
-        rc = pfnWriter(pThisCore->uData.pv, pThisCore->cb, pvUser, pErrInfo);
+        if (pThisCore->cb)
+        {
+            AssertPtrReturn(pThisCore->uData.pv,
+                            RTErrInfoSetF(pErrInfo, VERR_ASN1_INVALID_DATA_POINTER,
+                                          "Invalid uData pointer %p for lone ASN.1 core with %#x bytes of content",
+                                          pThisCore->uData.pv, pThisCore->cb));
+            rc = pfnWriter(pThisCore->uData.pv, pThisCore->cb, pvUser, pErrInfo);
+        }
     }
     return rc;