RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

additional error checking to prevent accidental range over-reference

This commit is contained in:
Arkady Trestman 2009-12-03 23:53:53 +00:00
parent b2d1bfa624
commit 9c73a2344d
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
direct/src/plugin_activex/PPPandaObject.cpp
View File

@ -59,6 +59,21 @@ STDMETHODIMP_(unsigned long) PPandaObject::Release()
return m_refs;
}
STDMETHODIMP PPandaObject::QueryInterface(REFIID riid, void FAR* FAR* ppv)
{
if(!IsEqualIID(riid, IID_IUnknown))
{
if(!IsEqualIID(riid, IID_IDispatch))
{
*ppv = NULL;
return E_NOINTERFACE;
}
}
*ppv = this;
AddRef();
return NOERROR;
}
STDMETHODIMP PPandaObject::GetIDsOfNames(
REFIID riid,
OLECHAR FAR* FAR* rgszNames,
@ -139,6 +154,8 @@ STDMETHODIMP PPandaObject::Invoke(
unsigned int FAR* puArgErr)
{
UNUSED(lcid);
HRESULT hr( S_OK );
if(!IsEqualIID(riid, IID_NULL))
{
@ -149,8 +166,12 @@ STDMETHODIMP PPandaObject::Invoke(
return E_FAIL;
}
if ( dispidMember >= m_idsOfNames.size( ) )
{
return E_FAIL;
}
CString& name( m_idsOfNames[dispidMember] );
HRESULT hr( S_OK );
switch ( wFlags )
{
@ -183,18 +204,3 @@ STDMETHODIMP PPandaObject::Invoke(
}
return hr;
}
STDMETHODIMP PPandaObject::QueryInterface(REFIID riid, void FAR* FAR* ppv)
{
if(!IsEqualIID(riid, IID_IUnknown))
{
if(!IsEqualIID(riid, IID_IDispatch))
{
*ppv = NULL;
return E_NOINTERFACE;
}
}
*ppv = this;
AddRef();
return NOERROR;
}