diff options
| author | Anatol Belski <ab@php.net> | 2016-12-12 01:29:59 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-12-12 01:29:59 +0100 |
| commit | b68cca260b72159d9afd828d4274a035fae5b937 (patch) | |
| tree | a95b1c96e5c3c980da5aa6439ba027432b3858ef | |
| parent | cf8e25853110e4e4bbef48673298c4fda7fefcc9 (diff) | |
| parent | e53f967ed77cef0dcacc66a3c022e35055475a95 (diff) | |
| download | php-git-b68cca260b72159d9afd828d4274a035fae5b937.tar.gz | |
Merge branch 'PHP-7.1'
* PHP-7.1:
fix datatype for zpp, yet a followup on bug #73679
| -rw-r--r-- | ext/com_dotnet/com_com.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/ext/com_dotnet/com_com.c b/ext/com_dotnet/com_com.c index ec1c72191c..86b3bd1dd5 100644 --- a/ext/com_dotnet/com_com.c +++ b/ext/com_dotnet/com_com.c @@ -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) { |