=?UTF-8?Q?Michael=20M=C3=BCller=20?=: wininet: Resize buffer when call to InternetCanonicalizeUrlW fails in InternetCrackUrlW.
Alexandre Julliard
julliard at winehq.org
Thu Nov 29 15:09:39 CST 2018
Module: wine
Branch: stable
Commit: 6fd7afe2a0eb73cbe510f1e5f1aa7825ca088ccf
URL: https://source.winehq.org/git/wine.git/?a=commit;h=6fd7afe2a0eb73cbe510f1e5f1aa7825ca088ccf
Author: Michael Müller <michael at fds-team.de>
Date: Fri Aug 31 02:29:05 2018 +0000
wininet: Resize buffer when call to InternetCanonicalizeUrlW fails in InternetCrackUrlW.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40598
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit bfe8510ec0c7bcef0be1f6990c56ad235d8bccd6)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
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 699962c..6be5ec7 100644
--- a/dlls/wininet/internet.c
+++ b/dlls/wininet/internet.c
@@ -1661,7 +1661,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;
@@ -1670,9 +1670,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 0af5835..2024b15 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 = sizeof(urlpart)/sizeof(urlpart[0]);
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)
More information about the wine-cvs
mailing list