Changeset 54188 in vbox for trunk

Timestamp:

Feb 13, 2015 2:28:19 AM (10 years ago)

Author:

vboxsync

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

98244

Message:

RTTimerChangeInterval now returns VERR_INVALID_STATE if not a periodic timer.

Location:

trunk

Files:

• include/iprt/timer.h (modified) (1 diff)
• src/VBox/Runtime/r0drv/linux/timer-r0drv-linux.c (modified) (1 diff)

trunk/include/iprt/timer.h

@@ -194 +194 @@
  * @retval  VERR_INVALID_HANDLE if pTimer isn't valid.
  * @retval  VERR_NOT_SUPPORTED if not supported.
+ * @retval  VERR_INVALID_STATE if not a periodic timer.
  *
  * @param   pTimer              The timer to activate.

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

@@ -1353 +1353 @@
     AssertReturn(pTimer->u32Magic == RTTIMER_MAGIC, VERR_INVALID_HANDLE);
     AssertReturn(u64NanoInterval, VERR_INVALID_PARAMETER);
+    AssertReturn(u64NanoInterval < UINT64_MAX / 8, VERR_INVALID_PARAMETER);
+    AssertReturn(pTimer->u64NanoInterval, VERR_INVALID_STATE);
     RTTIMERLNX_LOG(("change %p %llu\n", pTimer, u64NanoInterval));