cvs: php4 /ext/com COM.c
| From: | Harald Radi | Date: | Wed, 09 May 2001 00:00:01 +0000 |
| Subject: | cvs: php4 /ext/com COM.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-5606@lists.php.net to get a copy of this message | ||
phanto Tue May 8 17:00:01 2001 EDT
Modified files:
/php4/ext/com COM.c
Log:
E_ERROR instead of E_WARNING on nullpointer exceptions
Index: php4/ext/com/COM.c
diff -u php4/ext/com/COM.c:1.10 php4/ext/com/COM.c:1.11
--- php4/ext/com/COM.c:1.10 Thu May 3 04:20:28 2001
+++ php4/ext/com/COM.c Tue May 8 17:00:00 2001
@@ -131,13 +131,19 @@
{
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;