archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 08:49:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

remove temporary resources immediately

Browse source 
return value fix

#thanks to alan for 'remote debugging'
This commit is contained in:
Harald Radi 2002-05-02 13:37:31 +00:00
parent 830f094933
commit fe84a29b3f
2 changed files with 44 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

39
ext/com/COM.c
View file

@ -1439,34 +1439,38 @@ PHPAPI void php_COM_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_pro
pval *object_handle; pval *object_handle;
PHP_FN(com_load)(INTERNAL_FUNCTION_PARAM_PASSTHRU); PHP_FN(com_load)(INTERNAL_FUNCTION_PARAM_PASSTHRU);
if (!zend_is_true(return_value)) { if (zend_is_true(return_value)) {
ZVAL_FALSE(object); ALLOC_ZVAL(object_handle);
return; *object_handle = *return_value;
pval_copy_constructor(object_handle);
INIT_PZVAL(object_handle);
zend_hash_index_update(Z_OBJPROP_P(object), 0, &object_handle, sizeof(pval *), NULL);
pval_destructor(&function_name->element);
} else {
ZVAL_NULL(object);
} }
ALLOC_ZVAL(object_handle);
*object_handle = *return_value;
pval_copy_constructor(object_handle);
INIT_PZVAL(object_handle);
zend_hash_index_update(Z_OBJPROP_P(object), 0, &object_handle, sizeof(pval *), NULL);
pval_destructor(&function_name->element);
return; return;
} }
RETVAL_NULL();
property = php_COM_get_property_handler(property_reference); property = php_COM_get_property_handler(property_reference);
if (Z_TYPE(property) == IS_NULL) {
if (property.refcount == 1) { if (Z_TYPE(property) != IS_OBJECT) {
pval_destructor(&property); pval_destructor(&property);
}
pval_destructor(&function_name->element); pval_destructor(&function_name->element);
/* error message - function call on a non-object */
return; return;
} }
zend_hash_index_find(Z_OBJPROP(property), 0, (void **) &handle); zend_hash_index_find(Z_OBJPROP(property), 0, (void **) &handle);
obj = (comval *)zend_list_find(Z_LVAL_PP(handle), &type); obj = (comval *)zend_list_find(Z_LVAL_PP(handle), &type);
if (!obj || (type != IS_COM)) { if (!obj || (type != IS_COM)) {
pval_destructor(&property); pval_destructor(&property);
pval_destructor(&function_name->element); pval_destructor(&function_name->element);
return; return;
} }
@ -1486,9 +1490,7 @@ PHPAPI void php_COM_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_pro
arguments = (pval **) emalloc(sizeof(pval *)*arg_count); arguments = (pval **) emalloc(sizeof(pval *)*arg_count);
zend_get_parameters_array(ht, arg_count, arguments); zend_get_parameters_array(ht, arg_count, arguments);
if (do_COM_invoke(obj , &function_name->element, var_result, arguments, arg_count TSRMLS_CC) == FAILURE) { if (do_COM_invoke(obj , &function_name->element, var_result, arguments, arg_count TSRMLS_CC) == SUCCESS) {
RETVAL_FALSE;
} else {
php_variant_to_pval(var_result, return_value, codepage TSRMLS_CC); php_variant_to_pval(var_result, return_value, codepage TSRMLS_CC);
} }
@ -1496,9 +1498,12 @@ PHPAPI void php_COM_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_pro
efree(arguments); efree(arguments);
} }
if (property.refcount == 1) { if (zend_llist_count(property_reference->elements_list) > 1) {
/* destruct temporary object */
zend_list_delete(Z_LVAL_PP(handle));
pval_destructor(&property); pval_destructor(&property);
} }
pval_destructor(&function_name->element); pval_destructor(&function_name->element);
} }

39
ext/rpc/com/com_wrapper.c
View file

@ -1439,34 +1439,38 @@ PHPAPI void php_COM_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_pro
pval *object_handle; pval *object_handle;
PHP_FN(com_load)(INTERNAL_FUNCTION_PARAM_PASSTHRU); PHP_FN(com_load)(INTERNAL_FUNCTION_PARAM_PASSTHRU);
if (!zend_is_true(return_value)) { if (zend_is_true(return_value)) {
ZVAL_FALSE(object); ALLOC_ZVAL(object_handle);
return; *object_handle = *return_value;
pval_copy_constructor(object_handle);
INIT_PZVAL(object_handle);
zend_hash_index_update(Z_OBJPROP_P(object), 0, &object_handle, sizeof(pval *), NULL);
pval_destructor(&function_name->element);
} else {
ZVAL_NULL(object);
} }
ALLOC_ZVAL(object_handle);
*object_handle = *return_value;
pval_copy_constructor(object_handle);
INIT_PZVAL(object_handle);
zend_hash_index_update(Z_OBJPROP_P(object), 0, &object_handle, sizeof(pval *), NULL);
pval_destructor(&function_name->element);
return; return;
} }
RETVAL_NULL();
property = php_COM_get_property_handler(property_reference); property = php_COM_get_property_handler(property_reference);
if (Z_TYPE(property) == IS_NULL) {
if (property.refcount == 1) { if (Z_TYPE(property) != IS_OBJECT) {
pval_destructor(&property); pval_destructor(&property);
}
pval_destructor(&function_name->element); pval_destructor(&function_name->element);
/* error message - function call on a non-object */
return; return;
} }
zend_hash_index_find(Z_OBJPROP(property), 0, (void **) &handle); zend_hash_index_find(Z_OBJPROP(property), 0, (void **) &handle);
obj = (comval *)zend_list_find(Z_LVAL_PP(handle), &type); obj = (comval *)zend_list_find(Z_LVAL_PP(handle), &type);
if (!obj || (type != IS_COM)) { if (!obj || (type != IS_COM)) {
pval_destructor(&property); pval_destructor(&property);
pval_destructor(&function_name->element); pval_destructor(&function_name->element);
return; return;
} }
@ -1486,9 +1490,7 @@ PHPAPI void php_COM_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_pro
arguments = (pval **) emalloc(sizeof(pval *)*arg_count); arguments = (pval **) emalloc(sizeof(pval *)*arg_count);
zend_get_parameters_array(ht, arg_count, arguments); zend_get_parameters_array(ht, arg_count, arguments);
if (do_COM_invoke(obj , &function_name->element, var_result, arguments, arg_count TSRMLS_CC) == FAILURE) { if (do_COM_invoke(obj , &function_name->element, var_result, arguments, arg_count TSRMLS_CC) == SUCCESS) {
RETVAL_FALSE;
} else {
php_variant_to_pval(var_result, return_value, codepage TSRMLS_CC); php_variant_to_pval(var_result, return_value, codepage TSRMLS_CC);
} }
@ -1496,9 +1498,12 @@ PHPAPI void php_COM_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_pro
efree(arguments); efree(arguments);
} }
if (property.refcount == 1) { if (zend_llist_count(property_reference->elements_list) > 1) {
/* destruct temporary object */
zend_list_delete(Z_LVAL_PP(handle));
pval_destructor(&property); pval_destructor(&property);
} }
pval_destructor(&function_name->element); pval_destructor(&function_name->element);
} }