From: R��mi Bernon rbernon@codeweavers.com
--- dlls/win32u/rawinput.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/dlls/win32u/rawinput.c b/dlls/win32u/rawinput.c index 3a8aa53d829..ff686d8fd1f 100644 --- a/dlls/win32u/rawinput.c +++ b/dlls/win32u/rawinput.c @@ -821,6 +821,7 @@ static void register_rawinput_device( const RAWINPUTDEVICE *device ) BOOL WINAPI NtUserRegisterRawInputDevices( const RAWINPUTDEVICE *devices, UINT device_count, UINT device_size ) { struct rawinput_device *server_devices; + RAWINPUTDEVICE *new_registered_devices; SIZE_T size; BOOL ret; UINT i; @@ -857,8 +858,13 @@ BOOL WINAPI NtUserRegisterRawInputDevices( const RAWINPUTDEVICE *devices, UINT d pthread_mutex_lock( &rawinput_mutex );
size = (SIZE_T)device_size * (registered_device_count + device_count + 1); - registered_devices = realloc( registered_devices, size ); - if (registered_devices) for (i = 0; i < device_count; ++i) register_rawinput_device( devices + i ); + if (!(new_registered_devices = realloc( registered_devices, size ))) + ERR( "Failed to realloc %u registered rawinput devices\n", registered_device_count + device_count ); + else + { + registered_devices = new_registered_devices; + for (i = 0; i < device_count; ++i) register_rawinput_device( devices + i ); + }
server_devices = malloc( registered_device_count * sizeof(*server_devices) ); if (server_devices) for (i = 0; i < registered_device_count; ++i) @@ -871,7 +877,7 @@ BOOL WINAPI NtUserRegisterRawInputDevices( const RAWINPUTDEVICE *devices, UINT d
pthread_mutex_unlock( &rawinput_mutex );
- if (!registered_devices || !server_devices) + if (!new_registered_devices || !server_devices) { SetLastError( ERROR_OUTOFMEMORY ); return FALSE;