Changeset 45061 in vbox for trunk/src/VBox/Devices/Serial/DrvHostSerial.cpp

Timestamp:

Mar 18, 2013 2:09:03 PM (12 years ago)

Author:

vboxsync

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

84336

Message:

Review of PDM driver destructors making sure that variables they use are correctly initialized in the constructor. Found several RTFileClose(0) cases.

File:

• trunk/src/VBox/Devices/Serial/DrvHostSerial.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/Serial/DrvHostSerial.cpp

@@ -1070 +1070 @@
 
     /* Empty the send queue */
-    RTSemEventDestroy(pThis->SendSem);
-    pThis->SendSem = NIL_RTSEMEVENT;
+    if (pThis->SendSem != NIL_RTSEMEVENT)
+    {
+        RTSemEventDestroy(pThis->SendSem);
+        pThis->SendSem = NIL_RTSEMEVENT;
+    }
 
     int rc;
@@ -1092 +1095 @@
     }
 # endif
-    rc = RTFileClose(pThis->hDeviceFile); AssertRC(rc);
-    pThis->hDeviceFile = NIL_RTFILE;
+    if (pThis->hDeviceFile != NIL_RTFILE)
+    {
+        rc = RTFileClose(pThis->hDeviceFile); AssertRC(rc);
+        pThis->hDeviceFile = NIL_RTFILE;
+    }
 
 #elif defined(RT_OS_WINDOWS)
@@ -1136 +1142 @@
     pThis->hDeviceFile = INVALID_HANDLE_VALUE;
 #endif
+    pThis->SendSem     = NIL_RTSEMEVENT;
     /* IBase. */
     pDrvIns->IBase.pfnQueryInterface        = drvHostSerialQueryInterface;
@@ -1143 +1150 @@
     pThis->ICharConnector.pfnSetModemLines  = drvHostSerialSetModemLines;
     pThis->ICharConnector.pfnSetBreak       = drvHostSerialSetBreak;
-
-/** @todo Initialize all members with NIL values!! The destructor is ALWAYS called. */
 
     /*