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

shlwapi: UrlEscapeA should fail with E_POINTER when querying the buffer size.

This commit is contained in:
Hans Leidekker 2006-11-12 16:17:48 +01:00 committed by Alexandre Julliard
parent 5b026479c5
commit bc2e37ba44
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/shlwapi/tests/path.c
View File

@ -476,7 +476,13 @@ static void test_url_canonicalize(const char *szUrl, DWORD dwFlags, HRESULT dwEx
static void test_UrlEscape(void) static void test_UrlEscape(void)
{ {
DWORD size;
HRESULT ret;
unsigned int i; unsigned int i;
ret = UrlEscapeA("/woningplan/woonkamer basis.swf", NULL, &size, URL_ESCAPE_SPACES_ONLY);
ok(ret == E_POINTER, "got %x, expected %x\n", ret, E_POINTER);
for(i=0; i<sizeof(TEST_ESCAPE)/sizeof(TEST_ESCAPE[0]); i++) { for(i=0; i<sizeof(TEST_ESCAPE)/sizeof(TEST_ESCAPE[0]); i++) {
test_url_escape(TEST_ESCAPE[i].url, TEST_ESCAPE[i].flags, test_url_escape(TEST_ESCAPE[i].url, TEST_ESCAPE[i].flags,
TEST_ESCAPE[i].expectret, TEST_ESCAPE[i].expecturl); TEST_ESCAPE[i].expectret, TEST_ESCAPE[i].expecturl);

6
dlls/shlwapi/url.c
View File

@ -838,7 +838,7 @@ HRESULT WINAPI UrlEscapeA(
} }
if(ret == S_OK) { if(ret == S_OK) {
RtlUnicodeToMultiByteSize(&lenA, escapedW, lenW * sizeof(WCHAR)); RtlUnicodeToMultiByteSize(&lenA, escapedW, lenW * sizeof(WCHAR));
if(*pcchEscaped > lenA) { if(pszEscaped && *pcchEscaped > lenA) {
RtlUnicodeToMultiByteN(pszEscaped, *pcchEscaped - 1, &lenA, escapedW, lenW * sizeof(WCHAR)); RtlUnicodeToMultiByteN(pszEscaped, *pcchEscaped - 1, &lenA, escapedW, lenW * sizeof(WCHAR));
pszEscaped[lenA] = 0; pszEscaped[lenA] = 0;
*pcchEscaped = lenA; *pcchEscaped = lenA;
@ -967,8 +967,8 @@ HRESULT WINAPI UrlEscapeW(
TRACE("(%s %p %p 0x%08x)\n", debugstr_w(pszUrl), pszEscaped, TRACE("(%s %p %p 0x%08x)\n", debugstr_w(pszUrl), pszEscaped,
pcchEscaped, dwFlags); pcchEscaped, dwFlags);
if(!pszUrl || !pszEscaped || !pcchEscaped) if(!pszUrl || !pcchEscaped)
return E_INVALIDARG; return E_INVALIDARG;
if(dwFlags & ~(URL_ESCAPE_SPACES_ONLY | if(dwFlags & ~(URL_ESCAPE_SPACES_ONLY |
URL_ESCAPE_SEGMENT_ONLY | URL_ESCAPE_SEGMENT_ONLY |