diff options
| author | Anatol Belski <ab@php.net> | 2016-08-25 18:10:18 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-08-25 18:10:18 +0200 |
| commit | 8adddabbebf0f7c11a3521398ad3d2837d25631c (patch) | |
| tree | 5b5f115da5d2ac8ae0d106ab2426d62a02afded6 | |
| parent | fe13ee05bd8714c09fa87a636b849c0246202b62 (diff) | |
| parent | 9f0f7c03366090dec48e16f520388e7da28c416a (diff) | |
| download | php-git-8adddabbebf0f7c11a3521398ad3d2837d25631c.tar.gz | |
Merge branch 'PHP-7.1'
* PHP-7.1:
fix check for args by ref
| -rw-r--r-- | ext/com_dotnet/com_handlers.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ext/com_dotnet/com_handlers.c b/ext/com_dotnet/com_handlers.c index 415fcb92f4..a477093311 100644 --- a/ext/com_dotnet/com_handlers.c +++ b/ext/com_dotnet/com_handlers.c @@ -279,7 +279,6 @@ static union _zend_function *com_method_get(zend_object **object_ptr, zend_strin f.fn_flags = ZEND_ACC_CALL_VIA_HANDLER; f.function_name = zend_string_copy(name); f.handler = PHP_FN(com_method_handler); - zend_set_function_arg_flags((zend_function*)&f); fptr = &f; @@ -306,11 +305,11 @@ static union _zend_function *com_method_get(zend_object **object_ptr, zend_strin f.arg_info[i].allow_null = 1; if (bindptr.lpfuncdesc->lprgelemdescParam[i].paramdesc.wParamFlags & PARAMFLAG_FOUT) { f.arg_info[i].pass_by_reference = ZEND_SEND_BY_REF; - ZEND_SET_ARG_FLAG(fptr, i + 1, ZEND_SEND_BY_REF); } } f.num_args = bindptr.lpfuncdesc->cParams; + zend_set_function_arg_flags((zend_function*)&f); ITypeInfo_ReleaseFuncDesc(TI, bindptr.lpfuncdesc); break; |