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

st/prober: fix off by one in reallocating list of disabled drivers

Browse source
This commit is contained in:
Christoph Haag 2021-03-07 00:09:07 +01:00
parent 3e13e20c4c
commit 1e24602ca0
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/xrt/state_trackers/prober/p_prober.c
View file

@ -360,8 +360,9 @@ disable_drivers_from_conflicts(struct prober *p)
}
P_INFO(p, "Disabling %s because we have %s", second, first);
U_ARRAY_REALLOC_OR_FREE(p->disabled_drivers, char *, p->num_disabled_drivers++);
p->disabled_drivers[p->num_disabled_drivers - 1] = second;
size_t index = p->num_disabled_drivers++;
U_ARRAY_REALLOC_OR_FREE(p->disabled_drivers, char *, p->num_disabled_drivers);
p->disabled_drivers[index] = second;
}
}
}
@ -369,7 +370,6 @@ disable_drivers_from_conflicts(struct prober *p)
static void
parse_disabled_drivers(struct prober *p)
{
p->num_disabled_drivers = 0;
cJSON *disabled_drivers = cJSON_GetObjectItemCaseSensitive(p->json.root, "disabled");
if (!disabled_drivers) {
return;
@ -382,8 +382,9 @@ parse_disabled_drivers(struct prober *p)
continue;
}
U_ARRAY_REALLOC_OR_FREE(p->disabled_drivers, char *, p->num_disabled_drivers++);
p->disabled_drivers[p->num_disabled_drivers - 1] = disabled_driver->valuestring;
size_t index = p->num_disabled_drivers++;
U_ARRAY_REALLOC_OR_FREE(p->disabled_drivers, char *, p->num_disabled_drivers);
p->disabled_drivers[index] = disabled_driver->valuestring;
}
}
@ -445,6 +446,8 @@ initialize(struct prober *p, struct xrt_prober_entry_lists *lists)
p->auto_probers[i] = lists->auto_probers[i]();
}
p->num_disabled_drivers = 0;
parse_disabled_drivers(p);
disable_drivers_from_conflicts(p);