sapi: Handle zero-length attributes correctly in ISpObjectTokenCatego…

…ry::EnumTokens.
peterjc123 · Feb 20, 2024 · 4bbfd83 · 4bbfd83
1 parent 5243f2e
commit 4bbfd83
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c
@@ -205,6 +205,16 @@ static void test_token_category(void)
 
     IEnumSpObjectTokens_Release( enum_tokens );
 
+    hr = ISpObjectTokenCategory_EnumTokens( cat, L"", NULL, &enum_tokens );
+    ok( hr == S_OK, "got %08lx\n", hr );
+
+    count = 0xdeadbeef;
+    hr = IEnumSpObjectTokens_GetCount( enum_tokens, &count );
+    ok( hr == S_OK, "got %08lx\n", hr );
+    ok( count == 5, "got %lu\n", count );
+
+    IEnumSpObjectTokens_Release( enum_tokens );
+
     hr = ISpObjectTokenCategory_EnumTokens( cat, L"Language=409", NULL, &enum_tokens );
     ok( hr == S_OK, "got %08lx\n", hr );
 

diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c
@@ -947,7 +947,7 @@ static HRESULT score_attributes( ISpObjectToken *token, const WCHAR *attrs,
     unsigned int i, j;
     HRESULT hr;
 
-    if (!attrs)
+    if (!attrs || !*attrs)
     {
         *score = 1;
         return S_OK;