ryujinx/SDL
1
0
Fork 0
mirror of https://github.com/Ryujinx/SDL.git synced 2025-01-25 17:51:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't call scandir() inside of scandir()

Browse source 
This works around a crash in address sanitizer
This commit is contained in:
Sam Lantinga 2022-04-18 12:57:28 -07:00
parent 1ede941f5c
commit 57927a2458
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/joystick/linux/SDL_sysjoystick.c
View file

@ -636,8 +636,10 @@ filter_entries(const struct dirent *entry)
return IsJoystickDeviceNode(entry->d_name); return IsJoystickDeviceNode(entry->d_name);
} }
static int static int
sort_entries(const struct dirent **a, const struct dirent **b) sort_entries(const void *_a, const void *_b)
{ {
const struct dirent **a = (const struct dirent **)_a;
const struct dirent **b = (const struct dirent **)_b;
int numA, numB; int numA, numB;
int offset; int offset;
@ -682,7 +684,10 @@ LINUX_FallbackJoystickDetect(void)
struct dirent **entries = NULL; struct dirent **entries = NULL;
char path[PATH_MAX]; char path[PATH_MAX];
count = scandir("/dev/input", &entries, filter_entries, sort_entries); count = scandir("/dev/input", &entries, filter_entries, NULL);
if (count > 1) {
qsort(entries, count, sizeof(*entries), sort_entries);
}
for (i = 0; i < count; ++i) { for (i = 0; i < count; ++i) {
SDL_snprintf(path, SDL_arraysize(path), "/dev/input/%s", entries[i]->d_name); SDL_snprintf(path, SDL_arraysize(path), "/dev/input/%s", entries[i]->d_name);
MaybeAddDevice(path); MaybeAddDevice(path);