archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 17:04:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

E_ERROR instead of E_WARNING on nullpointer exceptions

Browse source
This commit is contained in:
Harald Radi 2001-05-09 00:00:01 +00:00
parent 383c757a43
commit ffefed1972
2 changed files with 24 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
ext/com/COM.c
View file

@ -131,13 +131,19 @@ PHPAPI HRESULT php_COM_set(i_dispatch *obj, IDispatch FAR* pDisp, int cleanup)
{ {
HRESULT hr; HRESULT hr;
obj->i.dispatch = pDisp; if((obj->i.dispatch = pDisp) == NULL)
obj->typelib = !FAILED(obj->i.dispatch->lpVtbl->GetTypeInfo(obj->i.dispatch, 0, LANG_NEUTRAL, &(obj->i.typeinfo))); {
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) { if(cleanup) {
pDisp = NULL; pDisp = NULL;
} else { } else {
hr = obj->i.dispatch->lpVtbl->AddRef(obj->i.dispatch); hr = obj->i.dispatch->lpVtbl->AddRef(obj->i.dispatch);
}
} }
return hr; return hr;

18
ext/rpc/com/com_wrapper.c
View file

@ -131,13 +131,19 @@ PHPAPI HRESULT php_COM_set(i_dispatch *obj, IDispatch FAR* pDisp, int cleanup)
{ {
HRESULT hr; HRESULT hr;
obj->i.dispatch = pDisp; if((obj->i.dispatch = pDisp) == NULL)
obj->typelib = !FAILED(obj->i.dispatch->lpVtbl->GetTypeInfo(obj->i.dispatch, 0, LANG_NEUTRAL, &(obj->i.typeinfo))); {
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) { if(cleanup) {
pDisp = NULL; pDisp = NULL;
} else { } else {
hr = obj->i.dispatch->lpVtbl->AddRef(obj->i.dispatch); hr = obj->i.dispatch->lpVtbl->AddRef(obj->i.dispatch);
}
} }
return hr; return hr;