[WIN32K]
authorRoel Messiant <roelmessiant@gmail.com>
Sat, 10 Dec 2011 00:14:31 +0000 (00:14 +0000)
committerRoel Messiant <roelmessiant@gmail.com>
Sat, 10 Dec 2011 00:14:31 +0000 (00:14 +0000)
Probe the whole GAMMARAMP struct before reading/writing from it. CID 14114 & 14115.

svn path=/trunk/; revision=54630

reactos/subsystems/win32/win32k/objects/icm.c

index 626a22f..97028e3 100644 (file)
@@ -150,12 +150,8 @@ NtGdiGetDeviceGammaRamp(HDC  hDC,
 
   _SEH2_TRY
   {
-     ProbeForWrite( Ramp,
-                    sizeof(PVOID),
-                    1);
-     RtlCopyMemory( Ramp,
-                    SafeRamp,
-                    sizeof(GAMMARAMP));
+     ProbeForWrite(Ramp, sizeof(GAMMARAMP), 1);
+     RtlCopyMemory(Ramp, SafeRamp, sizeof(GAMMARAMP));
   }
   _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
   {
@@ -376,12 +372,8 @@ NtGdiSetDeviceGammaRamp(HDC  hDC,
   }
   _SEH2_TRY
   {
-     ProbeForRead( Ramp,
-                   sizeof(PVOID),
-                   1);
-     RtlCopyMemory( SafeRamp,
-                    Ramp,
-                    sizeof(GAMMARAMP));
+     ProbeForRead(Ramp, sizeof(GAMMARAMP), 1);
+     RtlCopyMemory(SafeRamp, Ramp, sizeof(GAMMARAMP));
   }
   _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
   {