summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarald Radi <phanto@php.net>2002-03-15 20:48:26 +0000
committerHarald Radi <phanto@php.net>2002-03-15 20:48:26 +0000
commit3a1ebd4f519facbd7ec769304857aad40e49cf1c (patch)
tree52786730675ce3f76bc742d452c782e280c92709
parent45711eaba2cdfc479826a56a4dd1429ced1eb301 (diff)
downloadphp-git-3a1ebd4f519facbd7ec769304857aad40e49cf1c.tar.gz
@ fixed a bug that caused php to crash in php_COM_get_ids_of_names() (Harald, Paul)
-rw-r--r--ext/com/COM.c2
-rw-r--r--ext/rpc/com/com_wrapper.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/ext/com/COM.c b/ext/com/COM.c
index 2e7dd0e1b7..854bd6be13 100644
--- a/ext/com/COM.c
+++ b/ext/com/COM.c
@@ -1172,6 +1172,7 @@ PHP_FUNCTION(com_propget)
obj = (comval *)zend_list_find(Z_LVAL_P(arg_comval), &type);
if (!obj || (type != IS_COM)) {
php_error(E_WARNING,"%d is not a COM object handler", Z_LVAL_P(arg_comval));
+ RETURN_FALSE;
}
convert_to_string_ex(&arg_property);
@@ -1205,6 +1206,7 @@ PHP_FUNCTION(com_propput)
obj = (comval *)zend_list_find(Z_LVAL_P(arg_comval), &type);
if (!obj || (type != IS_COM)) {
php_error(E_WARNING,"%d is not a COM object handler", Z_LVAL_P(arg_comval));
+ RETURN_FALSE;
}
convert_to_string_ex(&arg_property);
diff --git a/ext/rpc/com/com_wrapper.c b/ext/rpc/com/com_wrapper.c
index 2e7dd0e1b7..854bd6be13 100644
--- a/ext/rpc/com/com_wrapper.c
+++ b/ext/rpc/com/com_wrapper.c
@@ -1172,6 +1172,7 @@ PHP_FUNCTION(com_propget)
obj = (comval *)zend_list_find(Z_LVAL_P(arg_comval), &type);
if (!obj || (type != IS_COM)) {
php_error(E_WARNING,"%d is not a COM object handler", Z_LVAL_P(arg_comval));
+ RETURN_FALSE;
}
convert_to_string_ex(&arg_property);
@@ -1205,6 +1206,7 @@ PHP_FUNCTION(com_propput)
obj = (comval *)zend_list_find(Z_LVAL_P(arg_comval), &type);
if (!obj || (type != IS_COM)) {
php_error(E_WARNING,"%d is not a COM object handler", Z_LVAL_P(arg_comval));
+ RETURN_FALSE;
}
convert_to_string_ex(&arg_property);