clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.0' into PHP-7.1

Browse Source 
* PHP-7.0:
  fix datatype for zpp, yet a followup on bug #73679
This commit is contained in:
Anatol Belski 2016-12-12 01:29:23 +01:00
commit e53f967ed7
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ext/com_dotnet/com_com.c
View File

@ -52,6 +52,7 @@ PHP_FUNCTION(com_create_instance)
RPC_C_AUTHN_LEVEL_DEFAULT, RPC_C_IMP_LEVEL_IMPERSONATE,
&authid, EOAC_NONE
};
zend_long cp = CP_ACP;
php_com_initialize();
obj = CDNO_FETCH(object);
@ -59,16 +60,22 @@ PHP_FUNCTION(com_create_instance)
if (FAILURE == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET,
ZEND_NUM_ARGS(), "s|s!ls",
&module_name, &module_name_len, &server_name, &server_name_len,
&obj->code_page, &typelib_name, &typelib_name_len) &&
&cp, &typelib_name, &typelib_name_len) &&
FAILURE == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET,
ZEND_NUM_ARGS(), "sa|ls",
&module_name, &module_name_len, &server_params, &obj->code_page,
&module_name, &module_name_len, &server_params, &cp,
&typelib_name, &typelib_name_len)) {
php_com_throw_exception(E_INVALIDARG, "Could not create COM object - invalid arguments!");
return;
}
if (Z_L(0) > cp || ZEND_LONG_INT_OVFL(cp)) {
php_com_throw_exception(E_INVALIDARG, "Could not create COM object - invalid codepage!");
return;
}
obj->code_page = (int)cp;
if (server_name) {
ctx = CLSCTX_REMOTE_SERVER;
} else if (server_params) {