mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-04-27 17:54:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make sure hidapi error handling is thread-safe

Browse Source 
The hidapi method of storing the error on the device is not thread-safe, and not only could it result in a double free if multiple threads were setting the error at the same time, but SDL could be trying to use the error message and have it be freed out from under it by another thread.

Use SDL's error functions since they already use thread-local storage.
This commit is contained in:
Sam Lantinga
2023-05-26 23:48:09 -07:00
parent d51f84a2e1
commit bc28790817
6 changed files with 46 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/hidapi/windows/hid.c
View File

@@ -285,8 +285,7 @@ static void register_winapi_error_to_buffer(wchar_t **error_buffer, const WCHAR
+ system_err_len
;
*error_buffer = (WCHAR *)calloc(msg_len + 1, sizeof (WCHAR));
WCHAR *msg = *error_buffer;
WCHAR *msg = (WCHAR *)calloc(msg_len + 1, sizeof (WCHAR));
if (!msg)
return;
@@ -307,6 +306,18 @@ static void register_winapi_error_to_buffer(wchar_t **error_buffer, const WCHAR
msg[msg_len-1] = L'\0';
msg_len--;
}
#ifdef HIDAPI_USING_SDL_RUNTIME
/* Thread-safe error handling */
char *error_utf8 = SDL_iconv_wchar_utf8(msg);
if (error_utf8) {
SDL_SetError("%s", error_utf8);
SDL_free(error_utf8);
}
free(msg);
#else
*error_buffer = msg;
#endif
}
#if defined(__GNUC__)
@@ -324,7 +335,16 @@ static void register_string_error_to_buffer(wchar_t **error_buffer, const WCHAR
*error_buffer = NULL;
if (string_error) {
#ifdef HIDAPI_USING_SDL_RUNTIME
/* Thread-safe error handling */
char *error_utf8 = SDL_iconv_wchar_utf8(string_error);
if (error_utf8) {
SDL_SetError("%s", error_utf8);
SDL_free(error_utf8);
}
#else
*error_buffer = _wcsdup(string_error);
#endif
}
}