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

shlwapi: Fix handling of an empty search string in StrStrW.

This commit is contained in:
Andrew Nguyen 2010-07-18 19:33:36 -05:00 committed by Alexandre Julliard
parent c43bac44ba
commit 9bcdb1c423
2 changed files with 58 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/shlwapi/string.c
View File

@ -584,7 +584,9 @@ LPSTR WINAPI StrStrA(LPCSTR lpszStr, LPCSTR lpszSearch)
*/
LPWSTR WINAPI StrStrW(LPCWSTR lpszStr, LPCWSTR lpszSearch)
{
if (!lpszStr || !lpszSearch) return NULL;
TRACE("(%s, %s)\n", debugstr_w(lpszStr), debugstr_w(lpszSearch));
if (!lpszStr || !lpszSearch || !*lpszSearch) return NULL;
return strstrW( lpszStr, lpszSearch );
}

55
dlls/shlwapi/tests/string.c
View File

@ -1007,6 +1007,60 @@ static void test_StrStrA(void)
}
}
static void test_StrStrW(void)
{
static const WCHAR emptyW[] = {0};
static const WCHAR deadbeefW[] = {'D','e','A','d','B','e','E','f',0};
static const WCHAR deadW[] = {'D','e','A','d',0};
static const WCHAR dead_lowerW[] = {'d','e','a','d',0};
static const WCHAR adbeW[] = {'A','d','B','e',0};
static const WCHAR adbe_lowerW[] = {'a','d','b','e',0};
static const WCHAR beefW[] = {'B','e','E','f',0};
static const WCHAR beef_lowerW[] = {'b','e','e','f',0};
const struct
{
const WCHAR *search;
const WCHAR *expect;
} StrStrW_cases[] =
{
{emptyW, NULL},
{deadW, deadbeefW},
{dead_lowerW, NULL},
{adbeW, deadbeefW + 2},
{adbe_lowerW, NULL},
{beefW, deadbeefW + 4},
{beef_lowerW, NULL},
};
LPWSTR ret;
int i;
/* Tests crash on Win9x. */
if (0)
{
ret = StrStrW(NULL, NULL);
ok(!ret, "Expected StrStrW to return NULL, got %p\n", ret);
ret = StrStrW(NULL, emptyW);
ok(!ret, "Expected StrStrW to return NULL, got %p\n", ret);
ret = StrStrW(emptyW, NULL);
ok(!ret, "Expected StrStrW to return NULL, got %p\n", ret);
}
ret = StrStrW(emptyW, emptyW);
ok(!ret, "Expected StrStrW to return NULL, got %p\n", ret);
for (i = 0; i < sizeof(StrStrW_cases)/sizeof(StrStrW_cases[0]); i++)
{
ret = StrStrW(deadbeefW, StrStrW_cases[i].search);
ok(ret == StrStrW_cases[i].expect,
"[%d] Expected StrStrW to return %p, got %p\n",
i, StrStrW_cases[i].expect, ret);
}
}
START_TEST(string)
{
HMODULE hShlwapi;
@ -1077,6 +1131,7 @@ START_TEST(string)
test_SHUnicodeToUnicode();
test_StrXXX_overflows();
test_StrStrA();
test_StrStrW();
CoUninitialize();
}