[PATCH 0/2] MR5069: wininet: Avoid crash in InternetCreateUrl with scheme unknown.
From: Bernhard Übelacker <bernhardu(a)mailbox.org> --- dlls/wininet/tests/url.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index c09315c301f..28269e8dd40 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -1225,7 +1225,7 @@ static void InternetCreateUrlA_test(void) urlComp.dwExtraInfoLength = strlen(urlComp.lpszExtraInfo); len = 256; szUrl = HeapAlloc(GetProcessHeap(), 0, len); - InternetCreateUrlA(&urlComp, ICU_ESCAPE, szUrl, &len); + ret = InternetCreateUrlA(&urlComp, ICU_ESCAPE, szUrl, &len); ok(ret, "Expected success\n"); ok(len == strlen(CREATE_URL13), "Got len %lu\n", len); ok(!strcmp(szUrl, CREATE_URL13), "Expected \"%s\", got \"%s\"\n", CREATE_URL13, szUrl); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5069
From: Bernhard Übelacker <bernhardu(a)mailbox.org> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=33050 --- dlls/wininet/internet.c | 6 ++++++ dlls/wininet/tests/url.c | 15 +++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 9702c3e4f05..2226a24b238 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -4376,6 +4376,12 @@ static BOOL calc_url_length(LPURL_COMPONENTSW lpUrlComponents, { LPCWSTR scheme; + if (lpUrlComponents->nScheme == INTERNET_SCHEME_UNKNOWN) + { + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + nScheme = lpUrlComponents->nScheme; if (nScheme == INTERNET_SCHEME_DEFAULT) diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index 28269e8dd40..2177d651f08 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -1231,6 +1231,21 @@ static void InternetCreateUrlA_test(void) ok(!strcmp(szUrl, CREATE_URL13), "Expected \"%s\", got \"%s\"\n", CREATE_URL13, szUrl); HeapFree(GetProcessHeap(), 0, szUrl); + + memset(&urlComp, 0, sizeof(urlComp)); + fill_url_components(&urlComp); + urlComp.lpszScheme = NULL; + urlComp.dwSchemeLength = 0; + urlComp.nScheme = INTERNET_SCHEME_UNKNOWN; + len = 256; + szUrl = HeapAlloc(GetProcessHeap(), 0, len); + SetLastError(0xdeadbeef); + ret = InternetCreateUrlA(&urlComp, 0, szUrl, &len); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); + + HeapFree(GetProcessHeap(), 0, szUrl); } static void InternetCanonicalizeUrl_test(void) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5069
Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=143042 Your paranoid android. === debian11b (64 bit WoW report) === wsdapi: discovery.c:1077: Test failed: Hello message not received discovery.c:1078: Test failed: EndpointReference not received discovery.c:1079: Test failed: AppSequence not received discovery.c:1080: Test failed: MetadataVersion not received discovery.c:1081: Test failed: Hello message metadata not received discovery.c:1082: Test failed: Custom header not received discovery.c:1083: Test failed: Wine namespace not received discovery.c:1084: Test failed: Body and Hello elements not received discovery.c:1085: Test failed: Custom body element not received discovery.c:1086: Test failed: Types not received discovery.c:1087: Test failed: XML namespaces not received discovery.c:1088: Test failed: Scopes not received discovery.c:1089: Test failed: XAddrs not received
This merge request was approved by Jacek Caban. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5069
Changing back to draft, because it looks like there is a side effect in windows test runs ... -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5069#note_60913
On Mon Feb 12 21:11:19 2024 +0000, Bernhard Übelacker wrote:
Changing back to draft, because it looks like there is a side effect in windows test runs ... Ok, i compared the windows pipline with these from wininet merge request from yesterday (e.g. [this](https://gitlab.winehq.org/piotr/wine/-/jobs/55245) ). It looks like it does not run any tests - maybe winetest.exe just contains touched tests? But I still wonder if there is an issue with my merge request?
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/5069#note_60917
participants (3)
-
Bernhard Übelacker -
Jacek Caban (＠jacek)
-
Marvin