cvs: php4 /ext/com COM.c
| From: | Harald Radi | Date: | Mon, 05 Aug 2002 23:41:26 +0000 |
| Subject: | cvs: php4 /ext/com COM.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-13161@lists.php.net to get a copy of this message | ||
phanto Mon Aug 5 19:41:26 2002 EDT
Modified files:
/php4/ext/com COM.c
Log:
removed a possible NULL pointer referencing inside an error handler
Index: php4/ext/com/COM.c
diff -u php4/ext/com/COM.c:1.84 php4/ext/com/COM.c:1.85
--- php4/ext/com/COM.c:1.84 Wed Jun 26 03:14:45 2002
+++ php4/ext/com/COM.c Mon Aug 5 19:41:25 2002
@@ -18,7 +18,7 @@
| Wez Furlong <wez@thebrainroom.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: COM.c,v 1.84 2002/06/26 07:14:45 derick Exp $ */
+/* $Id: COM.c,v 1.85 2002/08/05 23:41:25 phanto Exp $ */
/*
* This module implements support for COM components that support the IDispatch
* interface. Both local (COM) and remote (DCOM) components can be accessed.
@@ -1566,7 +1566,12 @@
FREE_VARIANT(var_result);
FREE_VARIANT(new_value);
- RETURN_NULL();
+
+ if (return_value) {
+ RETVAL_NULL();
+ }
+
+ return;
}
php_pval_to_variant(value, new_value, codepage TSRMLS_CC);
@@ -1592,7 +1597,11 @@
efree(new_value);
efree(propname);
- RETURN_NULL();
+ if (return_value) {
+ RETVAL_NULL();
+ }
+
+ return;
}
if (return_value) {