system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-15 06:41:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

mshtml: Make sure actual host length matches returned BSTR length.

Browse source 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2017-11-22 17:55:07 +03:00 committed by Alexandre Julliard
parent 0f487987bc
commit 0592537862
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
dlls/mshtml/htmllocation.c
View file

@ -351,13 +351,16 @@ static HRESULT WINAPI HTMLLocation_get_host(IHTMLLocation *iface, BSTR *p)
if(url.nPort) {
/* <hostname>:<port> */
const WCHAR format[] = {'%','u',0};
DWORD len = url.dwHostNameLength + 1 + 5;
DWORD len, port_len;
WCHAR portW[6];
WCHAR *buf;
port_len = snprintfW(portW, sizeof(portW)/sizeof(portW[0]), format, url.nPort);
len = url.dwHostNameLength + 1 /* ':' */ + port_len;
buf = *p = SysAllocStringLen(NULL, len);
memcpy(buf, url.lpszHostName, url.dwHostNameLength * sizeof(WCHAR));
buf[url.dwHostNameLength] = ':';
snprintfW(buf + url.dwHostNameLength + 1, 6, format, url.nPort);
memcpy(buf + url.dwHostNameLength + 1, portW, port_len * sizeof(WCHAR));
}else
*p = SysAllocStringLen(url.lpszHostName, url.dwHostNameLength);

7
dlls/mshtml/tests/htmllocation.c
View file

@ -168,10 +168,15 @@ static void test_host(IHTMLLocation *loc, const struct location_test *test)
hres = IHTMLLocation_get_host(loc, &str);
ok(hres == S_OK, "%s: get_host failed: 0x%08x\n", test->name, hres);
if(hres == S_OK)
if(hres == S_OK){
int len = test->host ? strlen(test->host) : 0;
ok(str_eq_wa(str, test->host),
"%s: expected retrieved host to be L\"%s\", was: %s\n",
test->name, test->host, wine_dbgstr_w(str));
ok(SysStringLen(str) == len, "%s: unexpected string length %u, expected %u\n",
test->name, SysStringLen(str), len);
}
SysFreeString(str);
}