[PATCH] wininet: Resize buffer when call to InternetCanonicalizeUrlW fails in InternetCrackUrlW
Marcus Meissner
meissner at suse.de
Thu Jul 12 05:10:50 CDT 2018
From: Michael Müller <michael at fds-team.de>
Import from wine-staging
Fixes wine bug 40598 in staging
Signed-off-by: Marcus Meissner <meissner at suse.de>
---
dlls/wininet/internet.c | 21 ++++++++++++++++++---
dlls/wininet/tests/url.c | 6 +++---
2 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c
index 6d0d35c711..b407e851af 100644
--- a/dlls/wininet/internet.c
+++ b/dlls/wininet/internet.c
@@ -1664,7 +1664,7 @@ BOOL WINAPI InternetCrackUrlW(const WCHAR *lpszUrl, DWORD dwUrlLength, DWORD dwF
if (dwFlags & ICU_DECODE)
{
- WCHAR *url_tmp;
+ WCHAR *url_tmp, *buffer;
DWORD len = dwUrlLength + 1;
BOOL ret;
@@ -1673,9 +1673,24 @@ BOOL WINAPI InternetCrackUrlW(const WCHAR *lpszUrl, DWORD dwUrlLength, DWORD dwF
SetLastError(ERROR_OUTOFMEMORY);
return FALSE;
}
- ret = InternetCanonicalizeUrlW(url_tmp, url_tmp, &len, ICU_DECODE | ICU_NO_ENCODE);
+
+ buffer = url_tmp;
+ ret = InternetCanonicalizeUrlW(url_tmp, buffer, &len, ICU_DECODE | ICU_NO_ENCODE);
+ if (!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER)
+ {
+ buffer = heap_alloc(len * sizeof(WCHAR));
+ if (!buffer)
+ {
+ SetLastError(ERROR_OUTOFMEMORY);
+ heap_free(url_tmp);
+ return FALSE;
+ }
+ ret = InternetCanonicalizeUrlW(url_tmp, buffer, &len, ICU_DECODE | ICU_NO_ENCODE);
+ }
if (ret)
- ret = InternetCrackUrlW(url_tmp, len, dwFlags & ~ICU_DECODE, lpUC);
+ ret = InternetCrackUrlW(buffer, len, dwFlags & ~ICU_DECODE, lpUC);
+
+ if (buffer != url_tmp) heap_free(buffer);
heap_free(url_tmp);
return ret;
}
diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c
index 18c77b6647..19ae7c3314 100644
--- a/dlls/wininet/tests/url.c
+++ b/dlls/wininet/tests/url.c
@@ -816,9 +816,9 @@ static void InternetCrackUrlW_test(void)
comp.lpszUrlPath = urlpart;
comp.dwUrlPathLength = ARRAY_SIZE(urlpart);
r = InternetCrackUrlW(url3, 0, ICU_DECODE, &comp);
- todo_wine ok(r, "InternetCrackUrlW failed unexpectedly\n");
- todo_wine ok(!strcmp_wa(host, "x.org"), "host is %s, should be x.org\n", wine_dbgstr_w(host));
- ok(urlpart[0] == 0, "urlpart should be empty\n");
+ ok(r, "InternetCrackUrlW failed unexpectedly\n");
+ ok(!strcmp_wa(host, "x.org"), "host is %s, should be x.org\n", wine_dbgstr_w(host));
+ todo_wine ok(urlpart[0] == 0, "urlpart should be empty\n");
}
static void fill_url_components(URL_COMPONENTSA *lpUrlComponents)
--
2.18.0
More information about the wine-devel
mailing list