Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-29 01:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

[WIN32K:NTUSER] Correctly capture UNICODE_STRING in NtUserEnumDisplaySettings.

Browse source
This commit is contained in:
Thomas Faber 2019-12-29 16:14:58 +01:00
parent be92be2e37
commit 3d81dc48a7
No known key found for this signature in database
GPG key ID: 076E7C3D44720826
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
win32ss/user/ntuser/display.c
View file

@ -596,6 +596,7 @@ NtUserEnumDisplaySettings(
OUT LPDEVMODEW lpDevMode,
IN DWORD dwFlags)
{
UNICODE_STRING ustrDeviceUser;
UNICODE_STRING ustrDevice;
WCHAR awcDevice[CCHDEVICENAME];
NTSTATUS Status;
@ -633,15 +634,17 @@ NtUserEnumDisplaySettings(
_SEH2_TRY
{
/* Probe the UNICODE_STRING and the buffer */
ProbeForReadUnicodeString(pustrDevice);
ustrDeviceUser = ProbeForReadUnicodeString(pustrDevice);
if (!pustrDevice->Length || !pustrDevice->Buffer)
if (!ustrDeviceUser.Length || !ustrDeviceUser.Buffer)
ExRaiseStatus(STATUS_NO_MEMORY);
ProbeForRead(pustrDevice->Buffer, pustrDevice->Length, sizeof(UCHAR));
ProbeForRead(ustrDeviceUser.Buffer,
ustrDeviceUser.Length,
sizeof(UCHAR));
/* Copy the string */
RtlCopyUnicodeString(&ustrDevice, pustrDevice);
RtlCopyUnicodeString(&ustrDevice, &ustrDeviceUser);
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{