@ fixed a bug that caused php to crash in php_COM_get_ids_of_names() (Harald, Paul)

diff --git a/ext/com/COM.c b/ext/com/COM.c
index 2e7dd0e1b73ddd7f7aaffe406e53adf1c5bc6fcb..854bd6be1331adbde86bdb7f5675e7fe17759b5a 100644 (file)
--- 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 2e7dd0e1b73ddd7f7aaffe406e53adf1c5bc6fcb..854bd6be1331adbde86bdb7f5675e7fe17759b5a 100644 (file)
--- 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);