mirror of
https://github.com/php/php-src.git
synced 2025-08-19 08:49:28 +02:00
E_ERROR instead of E_WARNING on nullpointer exceptions
This commit is contained in:
parent
383c757a43
commit
ffefed1972
2 changed files with 24 additions and 12 deletions
|
@ -131,13 +131,19 @@ PHPAPI HRESULT php_COM_set(i_dispatch *obj, IDispatch FAR* pDisp, int cleanup)
|
|||
{
|
||||
HRESULT hr;
|
||||
|
||||
obj->i.dispatch = pDisp;
|
||||
obj->typelib = !FAILED(obj->i.dispatch->lpVtbl->GetTypeInfo(obj->i.dispatch, 0, LANG_NEUTRAL, &(obj->i.typeinfo)));
|
||||
if((obj->i.dispatch = pDisp) == NULL)
|
||||
{
|
||||
php_error(E_ERROR, "NULL pointer exception");
|
||||
}
|
||||
else
|
||||
{
|
||||
obj->typelib = !FAILED(obj->i.dispatch->lpVtbl->GetTypeInfo(obj->i.dispatch, 0, LANG_NEUTRAL, &(obj->i.typeinfo)));
|
||||
|
||||
if(cleanup) {
|
||||
pDisp = NULL;
|
||||
} else {
|
||||
hr = obj->i.dispatch->lpVtbl->AddRef(obj->i.dispatch);
|
||||
if(cleanup) {
|
||||
pDisp = NULL;
|
||||
} else {
|
||||
hr = obj->i.dispatch->lpVtbl->AddRef(obj->i.dispatch);
|
||||
}
|
||||
}
|
||||
|
||||
return hr;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue