Changeset 34413 in vbox

Timestamp:

Nov 26, 2010 5:01:23 PM (14 years ago)

Author:

vboxsync

Message:

vfsbase.cpp: RTVfs*Release - Ignore NIL handles.

File:

• trunk/src/VBox/Runtime/common/vfs/vfsbase.cpp (modified) (7 diffs)

trunk/src/VBox/Runtime/common/vfs/vfsbase.cpp

@@ -397 +397 @@
 {
     RTVFSLOCKINTERNAL *pThis = hLock;
+    if (pThis == NIL_RTVFSLOCK)
+        return 0;
     AssertPtrReturn(pThis, UINT32_MAX);
     AssertReturn(pThis->enmType > RTVFSLOCKTYPE_INVALID && pThis->enmType < RTVFSLOCKTYPE_END, UINT32_MAX);
@@ -875 +877 @@
 {
     RTVFSOBJINTERNAL *pThis = hVfsObj;
+    if (pThis == NIL_RTVFSOBJ)
+        return 0;
     AssertPtrReturn(pThis, UINT32_MAX);
     AssertReturn(pThis->uMagic == RTVFSOBJ_MAGIC, UINT32_MAX);
@@ -1646 +1650 @@
 {
     RTVFSFSSTREAMINTERNAL *pThis = hVfsFss;
+    if (pThis == NIL_RTVFSFSSTREAM)
+        return 0;
     AssertPtrReturn(pThis, UINT32_MAX);
     AssertReturn(pThis->uMagic == RTVFSFSSTREAM_MAGIC, UINT32_MAX);
@@ -1702 +1708 @@
 {
     RTVFSDIRINTERNAL *pThis = hVfsDir;
+    if (pThis == NIL_RTVFSDIR)
+        return 0;
     AssertPtrReturn(pThis, UINT32_MAX);
     AssertReturn(pThis->uMagic == RTVFSDIR_MAGIC, UINT32_MAX);
@@ -1771 +1779 @@
 {
     RTVFSSYMLINKINTERNAL *pThis = hVfsSym;
+    if (pThis == NIL_RTVFSSYMLINK)
+        return 0;
     AssertPtrReturn(pThis, UINT32_MAX);
     AssertReturn(pThis->uMagic == RTVFSSYMLINK_MAGIC, UINT32_MAX);
@@ -1914 +1924 @@
 {
     RTVFSIOSTREAMINTERNAL *pThis = hVfsIos;
+    if (pThis == NIL_RTVFSIOSTREAM)
+        return 0;
     AssertPtrReturn(pThis, UINT32_MAX);
     AssertReturn(pThis->uMagic == RTVFSIOSTREAM_MAGIC, UINT32_MAX);
@@ -2351 +2363 @@
 {
     RTVFSFILEINTERNAL *pThis = hVfsFile;
+    if (pThis == NIL_RTVFSFILE)
+        return 0;
     AssertPtrReturn(pThis, UINT32_MAX);
     AssertReturn(pThis->uMagic == RTVFSFILE_MAGIC, UINT32_MAX);