From 03f802de772cecee500d021cfa5a29fd6897ee6f Mon Sep 17 00:00:00 2001 From: Jakob Bornecrantz Date: Thu, 28 May 2020 22:51:07 +0100 Subject: [PATCH] st/oxr: Correctly validate time in xrLocateSpace --- doc/changes/state_trackers/mr.354.2.md | 1 + src/xrt/state_trackers/oxr/oxr_api_space.c | 15 +++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 doc/changes/state_trackers/mr.354.2.md diff --git a/doc/changes/state_trackers/mr.354.2.md b/doc/changes/state_trackers/mr.354.2.md new file mode 100644 index 000000000..93c1a0633 --- /dev/null +++ b/doc/changes/state_trackers/mr.354.2.md @@ -0,0 +1 @@ +OpenXR: Correctly reject invalid times given to `xrLocateSpace`. diff --git a/src/xrt/state_trackers/oxr/oxr_api_space.c b/src/xrt/state_trackers/oxr/oxr_api_space.c index be1a5699b..207c4ad42 100644 --- a/src/xrt/state_trackers/oxr/oxr_api_space.c +++ b/src/xrt/state_trackers/oxr/oxr_api_space.c @@ -7,10 +7,6 @@ * @ingroup oxr_api */ -#include -#include -#include - #include "xrt/xrt_compiler.h" #include "math/m_api.h" @@ -23,6 +19,11 @@ #include "oxr_api_funcs.h" #include "oxr_api_verify.h" +#include +#include +#include +#include + XrResult oxr_xrCreateActionSpace(XrSession session, @@ -127,6 +128,12 @@ oxr_xrLocateSpace(XrSpace space, OXR_VERIFY_ARG_TYPE_AND_NOT_NULL(&log, location, XR_TYPE_SPACE_LOCATION); + if (time <= (XrTime)0) { + return oxr_error(&log, XR_ERROR_TIME_INVALID, + "(time == %" PRIi64 ") is not a valid time.", + time); + } + return oxr_space_locate(&log, spc, baseSpc, time, location); }