mirror of
https://github.com/php/php-src.git
synced 2025-08-18 23:18:56 +02:00
@ fixed a bug that caused php to crash in php_COM_get_ids_of_names() (Harald, Paul)
This commit is contained in:
parent
45711eaba2
commit
3a1ebd4f51
2 changed files with 4 additions and 0 deletions
|
@ -1172,6 +1172,7 @@ PHP_FUNCTION(com_propget)
|
||||||
obj = (comval *)zend_list_find(Z_LVAL_P(arg_comval), &type);
|
obj = (comval *)zend_list_find(Z_LVAL_P(arg_comval), &type);
|
||||||
if (!obj || (type != IS_COM)) {
|
if (!obj || (type != IS_COM)) {
|
||||||
php_error(E_WARNING,"%d is not a COM object handler", Z_LVAL_P(arg_comval));
|
php_error(E_WARNING,"%d is not a COM object handler", Z_LVAL_P(arg_comval));
|
||||||
|
RETURN_FALSE;
|
||||||
}
|
}
|
||||||
convert_to_string_ex(&arg_property);
|
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);
|
obj = (comval *)zend_list_find(Z_LVAL_P(arg_comval), &type);
|
||||||
if (!obj || (type != IS_COM)) {
|
if (!obj || (type != IS_COM)) {
|
||||||
php_error(E_WARNING,"%d is not a COM object handler", Z_LVAL_P(arg_comval));
|
php_error(E_WARNING,"%d is not a COM object handler", Z_LVAL_P(arg_comval));
|
||||||
|
RETURN_FALSE;
|
||||||
}
|
}
|
||||||
convert_to_string_ex(&arg_property);
|
convert_to_string_ex(&arg_property);
|
||||||
|
|
||||||
|
|
|
@ -1172,6 +1172,7 @@ PHP_FUNCTION(com_propget)
|
||||||
obj = (comval *)zend_list_find(Z_LVAL_P(arg_comval), &type);
|
obj = (comval *)zend_list_find(Z_LVAL_P(arg_comval), &type);
|
||||||
if (!obj || (type != IS_COM)) {
|
if (!obj || (type != IS_COM)) {
|
||||||
php_error(E_WARNING,"%d is not a COM object handler", Z_LVAL_P(arg_comval));
|
php_error(E_WARNING,"%d is not a COM object handler", Z_LVAL_P(arg_comval));
|
||||||
|
RETURN_FALSE;
|
||||||
}
|
}
|
||||||
convert_to_string_ex(&arg_property);
|
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);
|
obj = (comval *)zend_list_find(Z_LVAL_P(arg_comval), &type);
|
||||||
if (!obj || (type != IS_COM)) {
|
if (!obj || (type != IS_COM)) {
|
||||||
php_error(E_WARNING,"%d is not a COM object handler", Z_LVAL_P(arg_comval));
|
php_error(E_WARNING,"%d is not a COM object handler", Z_LVAL_P(arg_comval));
|
||||||
|
RETURN_FALSE;
|
||||||
}
|
}
|
||||||
convert_to_string_ex(&arg_property);
|
convert_to_string_ex(&arg_property);
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue