diff options
| author | Lorry Tar Creator <lorry-tar-importer@baserock.org> | 2014-03-26 19:21:20 +0000 |
|---|---|---|
| committer | <> | 2014-05-08 15:03:54 +0000 |
| commit | fb123f93f9f5ce42c8e5785d2f8e0edaf951740e (patch) | |
| tree | c2103d76aec5f1f10892cd1d3a38e24f665ae5db /src/VBox/Devices/Network/DrvVDE.cpp | |
| parent | 58ed4748338f9466599adfc8a9171280ed99e23f (diff) | |
| download | VirtualBox-master.tar.gz | |
Imported from /home/lorry/working-area/delta_VirtualBox/VirtualBox-4.3.10.tar.bz2.HEADVirtualBox-4.3.10master
Diffstat (limited to 'src/VBox/Devices/Network/DrvVDE.cpp')
| -rw-r--r-- | src/VBox/Devices/Network/DrvVDE.cpp | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/src/VBox/Devices/Network/DrvVDE.cpp b/src/VBox/Devices/Network/DrvVDE.cpp index 5dd5ed2e..af0a36d5 100644 --- a/src/VBox/Devices/Network/DrvVDE.cpp +++ b/src/VBox/Devices/Network/DrvVDE.cpp @@ -5,7 +5,7 @@ /* * Contributed by Renzo Davoli. VirtualSquare. University of Bologna, 2010 - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -480,12 +480,19 @@ static DECLCALLBACK(void) drvVDEDestruct(PPDMDRVINS pDrvIns) /* * Terminate the control pipe. */ - RTPipeClose(pThis->hPipeWrite); - pThis->hPipeWrite = NIL_RTPIPE; - RTPipeClose(pThis->hPipeRead); - pThis->hPipeRead = NIL_RTPIPE; + if (pThis->hPipeWrite != NIL_RTPIPE) + { + RTPipeClose(pThis->hPipeWrite); + pThis->hPipeWrite = NIL_RTPIPE; + } + if (pThis->hPipeRead != NIL_RTPIPE) + { + RTPipeClose(pThis->hPipeRead); + pThis->hPipeRead = NIL_RTPIPE; + } MMR3HeapFree(pThis->pszDeviceName); + pThis->pszDeviceName = NULL; /* * Kill the xmit lock. @@ -493,8 +500,11 @@ static DECLCALLBACK(void) drvVDEDestruct(PPDMDRVINS pDrvIns) if (RTCritSectIsInitialized(&pThis->XmitLock)) RTCritSectDelete(&pThis->XmitLock); - vde_close(pThis->pVdeConn); - pThis->pVdeConn = NULL; + if (pThis->pVdeConn) + { + vde_close(pThis->pVdeConn); + pThis->pVdeConn = NULL; + } #ifdef VBOX_WITH_STATISTICS /* |