ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mshtml: Fixed size check in res protocol ParseUrl(PARSE_SECURITY_URL) call.

This commit is contained in:
Jacek Caban 2011-02-08 15:09:38 +01:00 committed by Alexandre Julliard
parent 340fbb71f3
commit e175bee277
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/mshtml/protocol.c
View File

@ -864,7 +864,7 @@ static HRESULT WINAPI ResProtocolInfo_ParseUrl(IInternetProtocolInfo *iface, LPC
size = sizeof(wszFile)/sizeof(WCHAR) + len + 1; size = sizeof(wszFile)/sizeof(WCHAR) + len + 1;
if(pcchResult) if(pcchResult)
*pcchResult = size; *pcchResult = size;
if(size >= cchResult) if(size > cchResult)
return S_FALSE; return S_FALSE;
memcpy(pwzResult, wszFile, sizeof(wszFile)); memcpy(pwzResult, wszFile, sizeof(wszFile));

12
dlls/mshtml/tests/protocol.c
View File

@ -326,7 +326,7 @@ static void test_res_protocol(void)
ok(hres == S_OK, "Could not get IInternetProtocolInfo interface: %08x\n", hres); ok(hres == S_OK, "Could not get IInternetProtocolInfo interface: %08x\n", hres);
if(SUCCEEDED(hres)) { if(SUCCEEDED(hres)) {
WCHAR buf[128]; WCHAR buf[128];
DWORD size; DWORD size, expected_size;
int i; int i;
for(i = PARSE_CANONICALIZE; i <= PARSE_UNESCAPE; i++) { for(i = PARSE_CANONICALIZE; i <= PARSE_UNESCAPE; i++) {
@ -342,12 +342,20 @@ static void test_res_protocol(void)
sizeof(buf)/sizeof(buf[0]), &size, 0); sizeof(buf)/sizeof(buf[0]), &size, 0);
ok(hres == S_OK, "ParseUrl failed: %08x\n", hres); ok(hres == S_OK, "ParseUrl failed: %08x\n", hres);
res_sec_url_cmp(buf, size, mshtml_dllW); res_sec_url_cmp(buf, size, mshtml_dllW);
ok(size == lstrlenW(buf)+1, "size = %d\n", size);
expected_size = size;
hres = IInternetProtocolInfo_ParseUrl(protocol_info, blank_url, PARSE_SECURITY_URL, 0, buf,
expected_size, &size, 0);
ok(hres == S_OK, "ParseUrl failed: %08x\n", hres);
res_sec_url_cmp(buf, size, mshtml_dllW);
ok(size == expected_size, "size = %d\n", size);
size = 0; size = 0;
hres = IInternetProtocolInfo_ParseUrl(protocol_info, blank_url, PARSE_SECURITY_URL, 0, buf, hres = IInternetProtocolInfo_ParseUrl(protocol_info, blank_url, PARSE_SECURITY_URL, 0, buf,
3, &size, 0); 3, &size, 0);
ok(hres == S_FALSE, "ParseUrl failed: %08x, expected S_FALSE\n", hres); ok(hres == S_FALSE, "ParseUrl failed: %08x, expected S_FALSE\n", hres);
ok(size, "size=0\n"); ok(size == expected_size, "size = %d\n", size);
hres = IInternetProtocolInfo_ParseUrl(protocol_info, wrong_url1, PARSE_SECURITY_URL, 0, buf, hres = IInternetProtocolInfo_ParseUrl(protocol_info, wrong_url1, PARSE_SECURITY_URL, 0, buf,
sizeof(buf)/sizeof(buf[0]), &size, 0); sizeof(buf)/sizeof(buf[0]), &size, 0);