[2/2] kernel32: Handle memory allocation failure in ReadConsoleA.

[Dmitry Timoshkov]

---
 dlls/kernel32/console.c       | 6 ++++++
 dlls/kernel32/tests/console.c | 3 ---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c
index 67c353b..9d47bf4 100644
--- a/dlls/kernel32/console.c
+++ b/dlls/kernel32/console.c
@@ -1607,6 +1607,12 @@ BOOL WINAPI ReadConsoleA(HANDLE hConsoleInput, LPVOID lpBuffer, DWORD nNumberOfC
     DWORD	ncr = 0;
     BOOL	ret;
 
+    if (!ptr)
+    {
+        SetLastError(ERROR_NOT_ENOUGH_MEMORY);
+        return FALSE;
+    }
+
     if ((ret = ReadConsoleW(hConsoleInput, ptr, nNumberOfCharsToRead, &ncr, NULL)))
         ncr = WideCharToMultiByte(GetConsoleCP(), 0, ptr, ncr, lpBuffer, nNumberOfCharsToRead, NULL, NULL);
 
diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c
index 52dcaac..de34f89 100644
--- a/dlls/kernel32/tests/console.c
+++ b/dlls/kernel32/tests/console.c
@@ -2566,8 +2566,6 @@ static void test_ReadConsole(void)
     ok(ret == INVALID_FILE_SIZE, "expected INVALID_FILE_SIZE, got %#x\n", ret);
     ok(GetLastError() == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %d\n", GetLastError());
 
-if (0) /* FIXME: uncomment once Wine doesn't hang forever */
-{
     bytes = 0xdeadbeef;
     SetLastError(0xdeadbeef);
     ret = ReadFile(std_input, buf, -128, &bytes, NULL);
@@ -2581,7 +2579,6 @@ if (0) /* FIXME: uncomment once Wine doesn't hang forever */
     ok(!ret, "expected 0, got %u\n", ret);
     ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY, "expected ERROR_NOT_ENOUGH_MEMORY, got %d\n", GetLastError());
     ok(bytes == 0xdeadbeef, "expected 0xdeadbeef, %#x\n", bytes);
-}
 
 if (0) /* FIXME: uncomment once Wine doesn't hang forever */
 {
-- 
1.9.2