msctf: Don't crash on NULL input in EnumLanguageProfiles().

Signed-off-by: Michael Stefaniuc <mstefani@redhat.de> Signed-off-by: Aric Stewart <aric@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

msctf: Don't crash on NULL input in EnumLanguageProfiles().
fd0101ab · Michael Stefaniuc · Alexandre Julliard · a7112851 · fd0101ab · fd0101ab
Commit fd0101ab authored Jul 19, 2016 by Michael Stefaniuc Committed by Alexandre Julliard Jul 20, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 0 deletions

inputprocessor.c dlls/msctf/inputprocessor.c +4 -0

inputprocessor.c dlls/msctf/tests/inputprocessor.c +5 -0

No files found.
--- a/dlls/msctf/inputprocessor.c
+++ b/dlls/msctf/inputprocessor.c
@@ -617,6 +617,10 @@ static HRESULT WINAPI InputProcessorProfiles_EnumLanguageProfiles(
 {
    InputProcessorProfiles *This = impl_from_ITfInputProcessorProfiles(iface);
    TRACE("(%p) %x %p\n",This,langid,ppEnum);
+
+    if (!ppEnum)
+        return E_INVALIDARG;
+
    return EnumTfLanguageProfiles_Constructor(langid, ppEnum);
 }


--- a/dlls/msctf/tests/inputprocessor.c
+++ b/dlls/msctf/tests/inputprocessor.c
@@ -973,6 +973,11 @@ static void test_EnumLanguageProfiles(void)
 {
    BOOL found = FALSE;
    IEnumTfLanguageProfiles *ppEnum;
+    HRESULT hr;
+
+    hr = ITfInputProcessorProfiles_EnumLanguageProfiles(g_ipp, gLangid, NULL);
+    ok(hr == E_INVALIDARG, "EnumLanguageProfiles failed: %x\n", hr);
+
    if (SUCCEEDED(ITfInputProcessorProfiles_EnumLanguageProfiles(g_ipp,gLangid,&ppEnum)))
    {
        TF_LANGUAGEPROFILE profile;