wininet: Fixed handing NULL buffer in InternetReadFileExW.

Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wininet: Fixed handing NULL buffer in InternetReadFileExW.
f70c9ae8 · Jacek Caban · Alexandre Julliard · cebb5d30 · f70c9ae8 · f70c9ae8
Commit f70c9ae8 authored May 16, 2016 by Jacek Caban Committed by Alexandre Julliard May 17, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

internet.c dlls/wininet/internet.c +1 -1

http.c dlls/wininet/tests/http.c +5 -0

No files found.
--- a/dlls/wininet/internet.c
+++ b/dlls/wininet/internet.c
@@ -2280,7 +2280,7 @@ BOOL WINAPI InternetReadFileExW(HINTERNET hFile, LPINTERNET_BUFFERSW lpBuffer,

    TRACE("(%p %p 0x%x 0x%lx)\n", hFile, lpBuffer, dwFlags, dwContext);

-    if (lpBuffer->dwStructSize != sizeof(*lpBuffer)) {
+    if (!lpBuffer || lpBuffer->dwStructSize != sizeof(*lpBuffer)) {
        SetLastError(ERROR_INVALID_PARAMETER);
        return FALSE;
    }

--- a/dlls/wininet/tests/http.c
+++ b/dlls/wininet/tests/http.c
@@ -1067,6 +1067,11 @@ static void InternetReadFileExA_test(int flags)
    CLEAR_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER);
    CLEAR_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER);

+    rc = InternetReadFileExW(hor, NULL, 0, 0xdeadcafe);
+    ok(!rc && (GetLastError() == ERROR_INVALID_PARAMETER),
+        "InternetReadFileEx should have failed with ERROR_INVALID_PARAMETER instead of %s, %u\n",
+        rc ? "TRUE" : "FALSE", GetLastError());
+
    /* tests invalid dwStructSize */
    inetbuffers.dwStructSize = sizeof(inetbuffers)+1;
    inetbuffers.lpcszHeader = NULL;