mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-02-05 21:38:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

st/oxr: fix path length verification

Browse source 
We can't assume the string is null terminated.
This commit is contained in:
Christoph Haag 2019-04-16 02:10:37 +02:00 committed by Ryan Pavlik
parent d5f5d9f354
commit 09e9771a2d
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/xrt/state_trackers/oxr/oxr_verify.cpp
View file

@ -135,11 +135,14 @@ oxr_verify_full_path_c(struct oxr_logger* log,
const char* path,
const char* name)
{
size_t length = strlen(path);
if (length >= UINT32_MAX) {
return oxr_error(log, XR_ERROR_PATH_FORMAT_INVALID,
"(%s) path to long", name);
// XR_MAX_PATH_LENGTH is max including null terminator,
// length will not include null terminator
size_t length = XR_MAX_PATH_LENGTH;
for (size_t i = 0; i < XR_MAX_PATH_LENGTH; i++) {
if (path[i] == '\0') {
length = i;
break;
}
}
return oxr_verify_full_path(log, path, (uint32_t)length, name);
@ -154,11 +157,14 @@ oxr_verify_full_path(struct oxr_logger* log,
State state = State::Start;
bool valid = true;
if (length >= UINT32_MAX || (length + 1) > XR_MAX_PATH_LENGTH) {
return oxr_error(
log, XR_ERROR_PATH_FORMAT_INVALID,
"(%s) string is too long for a path (%u + 1) > %u", name,
(uint32_t)length, XR_MAX_PATH_LENGTH);
if (length >= XR_MAX_PATH_LENGTH) {
char formatted_path[XR_MAX_PATH_LENGTH + 6];
snprintf(formatted_path, XR_MAX_PATH_LENGTH + 6, "%s[...]",
path);
return oxr_error(log, XR_ERROR_PATH_FORMAT_INVALID,
"(%s) is too long for a path, must be shorter "
"than %u characters",
name, XR_MAX_PATH_LENGTH);
}
for (uint32_t i = 0; i < length; i++) {