[WIN32K]

- Avoid assigning a nonvolatile variable inside a try block. Spotted by Timo.
CORE-8094

svn path=/trunk/; revision=62965

diff --git a/reactos/win32ss/user/ntuser/winsta.c b/reactos/win32ss/user/ntuser/winsta.c
index fdadc21..f4fe81a 100644 (file)
--- a/reactos/win32ss/user/ntuser/winsta.c
+++ b/reactos/win32ss/user/ntuser/winsta.c
@@ -736,6 +736,9 @@ NtUserGetObjectInformation(
    }
 
 Exit:
    }
 
 Exit:

+   if (Status == STATUS_SUCCESS && nLength < nDataSize)
+      Status = STATUS_BUFFER_TOO_SMALL;
+

    _SEH2_TRY
    {
       if (nLengthNeeded)
    _SEH2_TRY
    {
       if (nLengthNeeded)


@@ -745,10 +748,7 @@ Exit:
       if (Status == STATUS_SUCCESS)
       {
          TRACE("Trying to copy data to caller (len = %lu, len needed = %lu)\n", nLength, nDataSize);
       if (Status == STATUS_SUCCESS)
       {
          TRACE("Trying to copy data to caller (len = %lu, len needed = %lu)\n", nLength, nDataSize);

-         if (nLength >= nDataSize)
-            RtlCopyMemory(pvInformation, pvData, nDataSize);
-         else
-            Status = STATUS_BUFFER_TOO_SMALL;
+         RtlCopyMemory(pvInformation, pvData, nDataSize);

       }
    }
    _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
       }
    }
    _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)