mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2024-12-28 18:46:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

st/oxr: Use snprintf to safely write strings to app

Browse source
This commit is contained in:
Jakob Bornecrantz 2022-10-13 12:22:50 +01:00 committed by Mateo de Mayo
parent 51730d2db1
commit 01d195808d
1 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/xrt/state_trackers/oxr/oxr_api_instance.c
View file

@ -252,28 +252,17 @@ oxr_xrResultToString(XrInstance instance, XrResult value, char buffer[XR_MAX_RES
struct oxr_instance *inst;
struct oxr_logger log;
OXR_VERIFY_INSTANCE_AND_INIT_LOG(&log, instance, inst, "xrResultToString");
#ifdef _MSC_VER
#define MAKE_RESULT_CASE(VAL, _) \
case VAL: { \
const char str[] = #VAL; \
_STATIC_ASSERT(sizeof(str) < XR_MAX_RESULT_STRING_SIZE); \
memcpy(buffer, str, sizeof(str)); \
break; \
}
#else
#define MAKE_RESULT_CASE(VAL, _) \
case VAL: \
strncpy(buffer, #VAL, XR_MAX_RESULT_STRING_SIZE); \
break;
#endif
case VAL: snprintf(buffer, XR_MAX_RESULT_STRING_SIZE, #VAL); break;
switch (value) {
XR_LIST_ENUM_XrResult(MAKE_RESULT_CASE);
default:
snprintf(buffer, XR_MAX_RESULT_STRING_SIZE, "XR_UNKNOWN_%s_%d", value < 0 ? "FAILURE" : "SUCCESS",
value);
}
buffer[XR_MAX_RESULT_STRING_SIZE - 1] = '\0';
// The function snprintf always null terminates.
return XR_SUCCESS;
}
@ -289,11 +278,12 @@ oxr_xrStructureTypeToString(XrInstance instance, XrStructureType value, char buf
#define MAKE_TYPE_CASE(VAL, _) \
case VAL: snprintf(buffer, XR_MAX_RESULT_STRING_SIZE, #VAL); break;
switch (value) {
XR_LIST_ENUM_XrStructureType(MAKE_TYPE_CASE);
default: snprintf(buffer, XR_MAX_RESULT_STRING_SIZE, "XR_UNKNOWN_STRUCTURE_TYPE_%d", value);
}
buffer[XR_MAX_RESULT_STRING_SIZE - 1] = '\0';
// The function snprintf always null terminates.
return XR_SUCCESS;
}