From: Bernhard Übelacker bernhardu@mailbox.org
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=58418 --- dlls/wininet/http.c | 8 ++++-- dlls/wininet/tests/http.c | 60 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 2 deletions(-)
diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 497a582ff89..dc0ce09141a 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1966,13 +1966,17 @@ static void HTTPREQ_CloseConnection(object_header_t *hdr) static DWORD str_to_buffer(const WCHAR *str, void *buffer, DWORD *size, BOOL unicode) { int len; + + if (!size) + return ERROR_INVALID_PARAMETER; + if (unicode) { WCHAR *buf = buffer;
if (str) len = lstrlenW(str); else len = 0; - if (*size < (len + 1) * sizeof(WCHAR)) + if (*size < (len + 1) * sizeof(WCHAR) || !buf) { *size = (len + 1) * sizeof(WCHAR); return ERROR_INSUFFICIENT_BUFFER; @@ -1989,7 +1993,7 @@ static DWORD str_to_buffer(const WCHAR *str, void *buffer, DWORD *size, BOOL uni
if (str) len = WideCharToMultiByte(CP_ACP, 0, str, -1, NULL, 0, NULL, NULL); else len = 1; - if (*size < len) + if (*size < len || !buf) { *size = len; return ERROR_INSUFFICIENT_BUFFER; diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index b368f2a7dcb..394d3e5baf6 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -3013,6 +3013,11 @@ static void test_proxy_direct(int port) hr = HttpOpenRequestA(hc, NULL, "/test2", NULL, NULL, NULL, 0, 0); ok(hr != NULL, "HttpOpenRequest failed\n");
+ SetLastError(0xdeadbeef); + r = InternetQueryOptionA(hr, INTERNET_OPTION_PROXY_PASSWORD, NULL, NULL); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %lu\n", GetLastError()); + ok(!r, "unexpected success\n"); + sz = 0; SetLastError(0xdeadbeef); r = InternetQueryOptionA(hr, INTERNET_OPTION_PROXY_PASSWORD, NULL, &sz); @@ -3020,6 +3025,18 @@ static void test_proxy_direct(int port) ok(!r, "unexpected success\n"); ok(sz == 1, "got %lu\n", sz);
+ sz = 0xbeef; + SetLastError(0xdeadbeef); + r = InternetQueryOptionA(hr, INTERNET_OPTION_PROXY_PASSWORD, NULL, &sz); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", GetLastError()); + ok(!r, "unexpected success\n"); + ok(sz == 1, "got %lu\n", sz); + + SetLastError(0xdeadbeef); + r = InternetQueryOptionA(hr, INTERNET_OPTION_PROXY_USERNAME, NULL, NULL); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %lu\n", GetLastError()); + ok(!r, "unexpected success\n"); + sz = 0; SetLastError(0xdeadbeef); r = InternetQueryOptionA(hr, INTERNET_OPTION_PROXY_USERNAME, NULL, &sz); @@ -3027,6 +3044,13 @@ static void test_proxy_direct(int port) ok(!r, "unexpected success\n"); ok(sz == 1, "got %lu\n", sz);
+ sz = 0xbeef; + SetLastError(0xdeadbeef); + r = InternetQueryOptionA(hr, INTERNET_OPTION_PROXY_USERNAME, NULL, &sz); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", GetLastError()); + ok(!r, "unexpected success\n"); + ok(sz == 1, "got %lu\n", sz); + sz = sizeof(buffer); SetLastError(0xdeadbeef); r = InternetQueryOptionA(hr, INTERNET_OPTION_PROXY_PASSWORD, buffer, &sz); @@ -3039,6 +3063,11 @@ static void test_proxy_direct(int port) ok(r, "unexpected failure %lu\n", GetLastError()); ok(!sz, "got %lu\n", sz);
+ SetLastError(0xdeadbeef); + r = InternetQueryOptionA(hr, INTERNET_OPTION_PASSWORD, NULL, NULL); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %lu\n", GetLastError()); + ok(!r, "unexpected success\n"); + sz = 0; SetLastError(0xdeadbeef); r = InternetQueryOptionA(hr, INTERNET_OPTION_PASSWORD, NULL, &sz); @@ -3046,6 +3075,18 @@ static void test_proxy_direct(int port) ok(!r, "unexpected success\n"); ok(sz == 1, "got %lu\n", sz);
+ sz = 0xbeef; + SetLastError(0xdeadbeef); + r = InternetQueryOptionA(hr, INTERNET_OPTION_PASSWORD, NULL, &sz); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", GetLastError()); + ok(!r, "unexpected success\n"); + ok(sz == 1, "got %lu\n", sz); + + SetLastError(0xdeadbeef); + r = InternetQueryOptionA(hr, INTERNET_OPTION_USERNAME, NULL, NULL); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %lu\n", GetLastError()); + ok(!r, "unexpected success\n"); + sz = 0; SetLastError(0xdeadbeef); r = InternetQueryOptionA(hr, INTERNET_OPTION_USERNAME, NULL, &sz); @@ -3053,6 +3094,13 @@ static void test_proxy_direct(int port) ok(!r, "unexpected success\n"); ok(sz == 1, "got %lu\n", sz);
+ sz = 0xbeef; + SetLastError(0xdeadbeef); + r = InternetQueryOptionA(hr, INTERNET_OPTION_USERNAME, NULL, &sz); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", GetLastError()); + ok(!r, "unexpected success\n"); + ok(sz == 1, "got %lu\n", sz); + sz = sizeof(buffer); SetLastError(0xdeadbeef); r = InternetQueryOptionA(hr, INTERNET_OPTION_PASSWORD, buffer, &sz); @@ -3065,6 +3113,11 @@ static void test_proxy_direct(int port) ok(r, "unexpected failure %lu\n", GetLastError()); ok(!sz, "got %lu\n", sz);
+ SetLastError(0xdeadbeef); + r = InternetQueryOptionA(hr, INTERNET_OPTION_URL, NULL, NULL); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %lu\n", GetLastError()); + ok(!r, "unexpected success\n"); + sz = 0; SetLastError(0xdeadbeef); r = InternetQueryOptionA(hr, INTERNET_OPTION_URL, NULL, &sz); @@ -3072,6 +3125,13 @@ static void test_proxy_direct(int port) ok(!r, "unexpected success\n"); ok(sz == 34, "got %lu\n", sz);
+ sz = 0xbeef; + SetLastError(0xdeadbeef); + r = InternetQueryOptionA(hr, INTERNET_OPTION_URL, NULL, &sz); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", GetLastError()); + ok(!r, "unexpected success\n"); + ok(sz == 34, "got %lu\n", sz); + sz = sizeof(buffer); SetLastError(0xdeadbeef); r = InternetQueryOptionA(hr, INTERNET_OPTION_URL, buffer, &sz);