Commit 5739db59 authored by Zhiyi Zhang's avatar Zhiyi Zhang Committed by Alexandre Julliard

atl: Avoid NULL pointer reference in AtlComModuleGetClassObject().

parent b6225478
......@@ -21227,6 +21227,7 @@ wine_fn_config_makefile dlls/atl/tests enable_tests
wine_fn_config_makefile dlls/atl100 enable_atl100
wine_fn_config_makefile dlls/atl100/tests enable_tests
wine_fn_config_makefile dlls/atl110 enable_atl110
wine_fn_config_makefile dlls/atl110/tests enable_tests
wine_fn_config_makefile dlls/atl80 enable_atl80
wine_fn_config_makefile dlls/atl80/tests enable_tests
wine_fn_config_makefile dlls/atl90 enable_atl90
......
......@@ -2394,6 +2394,7 @@ WINE_CONFIG_MAKEFILE(dlls/atl/tests)
WINE_CONFIG_MAKEFILE(dlls/atl100)
WINE_CONFIG_MAKEFILE(dlls/atl100/tests)
WINE_CONFIG_MAKEFILE(dlls/atl110)
WINE_CONFIG_MAKEFILE(dlls/atl110/tests)
WINE_CONFIG_MAKEFILE(dlls/atl80)
WINE_CONFIG_MAKEFILE(dlls/atl80/tests)
WINE_CONFIG_MAKEFILE(dlls/atl90)
......
......@@ -482,7 +482,7 @@ HRESULT WINAPI AtlComModuleGetClassObject(_ATL_COM_MODULE *pm, REFCLSID rclsid,
return E_INVALIDARG;
for(iter = pm->m_ppAutoObjMapFirst; iter < pm->m_ppAutoObjMapLast; iter++) {
if(IsEqualCLSID((*iter)->pclsid, rclsid) && (*iter)->pfnGetClassObject) {
if(*iter && IsEqualCLSID((*iter)->pclsid, rclsid) && (*iter)->pfnGetClassObject) {
if(!(*iter)->pCF)
hres = (*iter)->pfnGetClassObject((*iter)->pfnCreateInstance, &IID_IUnknown, (void**)&(*iter)->pCF);
if((*iter)->pCF)
......@@ -507,7 +507,7 @@ HRESULT WINAPI AtlComModuleGetClassObject(_ATL_COM_MODULE *pm, REFCLSID rclsid,
return E_INVALIDARG;
for(iter = pm->m_ppAutoObjMapFirst; iter < pm->m_ppAutoObjMapLast; iter++) {
if(IsEqualCLSID((*iter)->pclsid, rclsid) && (*iter)->pfnGetClassObject) {
if(*iter && IsEqualCLSID((*iter)->pclsid, rclsid) && (*iter)->pfnGetClassObject) {
if(!(*iter)->pCache->pCF)
hres = (*iter)->pfnGetClassObject((*iter)->pfnCreateInstance, &IID_IUnknown, (void**)&(*iter)->pCache->pCF);
if((*iter)->pCache->pCF)
......
......@@ -1062,6 +1062,32 @@ static void test_AtlAxCreateControl(void)
DestroyWindow(hwnd);
}
static void test_AtlComModuleGetClassObject(void)
{
_ATL_OBJMAP_ENTRY *null_entry = NULL;
_ATL_COM_MODULE module;
HRESULT hr;
void *ret;
/* Test NULL module */
hr = AtlComModuleGetClassObject(NULL, &GUID_NULL, &IID_NULL, &ret);
ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
/* Test NULL m_ppAutoObjMapFirst and m_ppAutoObjMapLast */
module.cbSize = sizeof(module);
module.m_ppAutoObjMapFirst = NULL;
module.m_ppAutoObjMapLast = NULL;
hr = AtlComModuleGetClassObject(&module, &GUID_NULL, &IID_NULL, &ret);
ok(hr == CLASS_E_CLASSNOTAVAILABLE, "Unexpected hr %#lx.\n", hr);
/* Test m_ppAutoObjMapFirst and m_ppAutoObjMapLast both pointing to a NULL entry */
module.cbSize = sizeof(module);
module.m_ppAutoObjMapFirst = &null_entry;
module.m_ppAutoObjMapLast = &null_entry;
hr = AtlComModuleGetClassObject(&module, &GUID_NULL, &IID_NULL, &ret);
ok(hr == CLASS_E_CLASSNOTAVAILABLE, "Unexpected hr %#lx.\n", hr);
}
START_TEST(atl)
{
if (!register_class())
......@@ -1077,6 +1103,7 @@ START_TEST(atl)
test_ax_win();
test_AtlAxAttachControl();
test_AtlAxCreateControl();
test_AtlComModuleGetClassObject();
CoUninitialize();
}
TESTDLL = atl110.dll
IMPORTS = uuid ole32 atl110
EXTRADEFS = -D_ATL_VER=_ATL_VER_110
C_SRCS = \
atl.c
/*
* Copyright 2022 Zhiyi Zhang for CodeWeavers
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <stdarg.h>
#include <stdio.h>
#define COBJMACROS
#define CONST_VTABLE
#include <windef.h>
#include <winbase.h>
#include <winuser.h>
#include <atlbase.h>
#include <wine/test.h>
static void test_AtlComModuleGetClassObject(void)
{
_ATL_OBJMAP_ENTRY_EX *null_entry = NULL;
_ATL_COM_MODULE module;
HRESULT hr;
void *ret;
/* Test NULL module */
hr = AtlComModuleGetClassObject(NULL, &GUID_NULL, &IID_NULL, &ret);
ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
/* Test NULL m_ppAutoObjMapFirst and m_ppAutoObjMapLast */
module.cbSize = sizeof(module);
module.m_ppAutoObjMapFirst = NULL;
module.m_ppAutoObjMapLast = NULL;
hr = AtlComModuleGetClassObject(&module, &GUID_NULL, &IID_NULL, &ret);
ok(hr == CLASS_E_CLASSNOTAVAILABLE, "Unexpected hr %#lx.\n", hr);
/* Test m_ppAutoObjMapFirst and m_ppAutoObjMapLast both pointing to a NULL entry */
module.cbSize = sizeof(module);
module.m_ppAutoObjMapFirst = &null_entry;
module.m_ppAutoObjMapLast = &null_entry;
hr = AtlComModuleGetClassObject(&module, &GUID_NULL, &IID_NULL, &ret);
ok(hr == CLASS_E_CLASSNOTAVAILABLE, "Unexpected hr %#lx.\n", hr);
}
START_TEST(atl)
{
CoInitialize(NULL);
test_AtlComModuleGetClassObject();
CoUninitialize();
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment