Changeset 33043 in vbox for trunk/src

Timestamp:

Oct 11, 2010 3:56:04 PM (14 years ago)

Author:

vboxsync

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

66567

Message:

nt,linux: Added missing flag validation in the RTSemEventMultiWaitEx* implementations.

Location:

trunk/src/VBox/Runtime/r0drv

Files:

trunk/src/VBox/Runtime/r0drv/linux/semevent-r0drv-linux.c

r33033	r33043
178	178	AssertPtrReturn(pThis, VERR_INVALID_PARAMETER);
179	179	AssertMsgReturn(pThis->u32Magic == RTSEMEVENT_MAGIC, ("%p u32Magic=%RX32\n", pThis, pThis->u32Magic), VERR_INVALID_PARAMETER);
	180	AssertReturn(RTSEMWAIT_FLAGS_ARE_VALID(fFlags), VERR_INVALID_PARAMETER);
180	181	rtR0SemEventLnxRetain(pThis);
181	182

-              r33033
+              r33043
 /** @}  */
 /*******************************************************************************
 *   Structures and Typedefs                                                    *
 …
     uint32_t volatile   u32Magic;
     /** The object state bit and generation counter.
+     * The generation counter is incremented every time the object is   */
+     * The generation counter is incremented every time the object is
+     * signalled. */
     uint32_t volatile   fStateAndGen;
     /** Reference counter. */
 …
     AssertPtrReturn(pThis, VERR_INVALID_PARAMETER);
     AssertMsgReturn(pThis->u32Magic == RTSEMEVENTMULTI_MAGIC, ("%p u32Magic=%RX32\n", pThis, pThis->u32Magic), VERR_INVALID_PARAMETER);
+    AssertReturn(RTSEMWAIT_FLAGS_ARE_VALID(fFlags), VERR_INVALID_PARAMETER);
     rtR0SemEventMultiLnxRetain(pThis);

-              r33038
+              r33043
     AssertPtrReturn(pThis, VERR_INVALID_PARAMETER);
     AssertMsgReturn(pThis->u32Magic == RTSEMEVENT_MAGIC, ("%p u32Magic=%RX32\n", pThis, pThis->u32Magic), VERR_INVALID_PARAMETER);
+    AssertReturn(RTSEMWAIT_FLAGS_ARE_VALID(fFlags), VERR_INVALID_PARAMETER);
     rtR0SemEventNtRetain(pThis);
 …
+    }
     /*
      * Wait for it.

-              r33038
+              r33043
     AssertPtrReturn(pThis, VERR_INVALID_PARAMETER);
     AssertMsgReturn(pThis->u32Magic == RTSEMEVENTMULTI_MAGIC, ("%p u32Magic=%RX32\n", pThis, pThis->u32Magic), VERR_INVALID_PARAMETER);
+    AssertReturn(RTSEMWAIT_FLAGS_ARE_VALID(fFlags), VERR_INVALID_PARAMETER);
     rtR0SemEventMultiNtRetain(pThis);
 …
+    }
     /*
      * Wait for it.

Note: See TracChangeset for help on using the changeset viewer.