Changeset 86387 in vbox for trunk

Timestamp:

Oct 1, 2020 2:44:33 PM (4 years ago)

Author:

vboxsync

Message:

IPRT/RTTraceLogWr*: Ignore NIL on destroy (iprt protocol) and always verify magic. bugref:9841

File:

• trunk/src/VBox/Runtime/common/log/tracelogwriter.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/common/log/tracelogwriter.cpp

@@ -859 +859 @@
 RTDECL(int) RTTraceLogWrDestroy(RTTRACELOGWR hTraceLogWr)
 {
+    if (hTraceLogWr == NIL_RTTRACELOGWR)
+        return VINF_SUCCESS;
     PRTTRACELOGWRINT pThis = hTraceLogWr;
     AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
+    AssertReturn(pThis->u32Magic == RTTRACELOGWR_MAGIC, VERR_INVALID_HANDLE);
 
     pThis->u32Magic = RTTRACELOGWR_MAGIC_DEAD;
@@ -875 +878 @@
     PRTTRACELOGWRINT pThis = hTraceLogWr;
     AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
+    AssertReturn(pThis->u32Magic == RTTRACELOGWR_MAGIC, VERR_INVALID_HANDLE);
     AssertPtrReturn(pEvtDesc, VERR_INVALID_POINTER);
 
@@ -887 +891 @@
     PRTTRACELOGWRINT pThis = hTraceLogWr;
     AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
+    AssertReturn(pThis->u32Magic == RTTRACELOGWR_MAGIC, VERR_INVALID_HANDLE);
 
     int rc = VINF_SUCCESS;
@@ -920 +925 @@
     PRTTRACELOGWRINT pThis = hTraceLogWr;
     AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
+    AssertReturn(pThis->u32Magic == RTTRACELOGWR_MAGIC, VERR_INVALID_HANDLE);
 
     int rc = VINF_SUCCESS;