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

don't set CLSCTX_REMOTE_SERVER if NULL is passed as servername

Browse source
This commit is contained in:
Harald Radi 2002-04-27 10:17:46 +00:00
parent 6147e1e720
commit a380af2247
2 changed files with 8 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

13
ext/com/COM.c
View file

@ -501,14 +501,11 @@ PHP_FUNCTION(com_load)
} }
if (server_name != NULL) { if (server_name != NULL) {
/* if a server is passed, one obviously wants to instanciate a
* remote server
*/
flags = CLSCTX_REMOTE_SERVER;
/* What is server name? A String or an array? */ /* What is server name? A String or an array? */
if (Z_TYPE_P(server_name) == IS_ARRAY) { if (Z_TYPE_P(server_name) == IS_NULL) {
server_name = NULL;
} else if (Z_TYPE_P(server_name) == IS_ARRAY) {
pval **tmp; pval **tmp;
/* DAB: 22 Sept 2001 */ /* DAB: 22 Sept 2001 */
/* Aha - we have a number of possible */ /* Aha - we have a number of possible */
@ -568,14 +565,12 @@ PHP_FUNCTION(com_load)
convert_to_long_ex(tmp); convert_to_long_ex(tmp);
flags = (CLSCTX) Z_LVAL_PP(tmp); flags = (CLSCTX) Z_LVAL_PP(tmp);
} }
}
if (Z_TYPE_P(server_name) == IS_NULL) {
server_name = NULL;
} else { } else {
if (!INI_INT("com.allow_dcom")) { if (!INI_INT("com.allow_dcom")) {
php_error(E_WARNING, "DCOM is disabled"); php_error(E_WARNING, "DCOM is disabled");
RETURN_FALSE; RETURN_FALSE;
} else { } else {
flags = CLSCTX_REMOTE_SERVER;
convert_to_string_ex(&server_name); convert_to_string_ex(&server_name);
} }
} }

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

@ -501,14 +501,11 @@ PHP_FUNCTION(com_load)
} }
if (server_name != NULL) { if (server_name != NULL) {
/* if a server is passed, one obviously wants to instanciate a
* remote server
*/
flags = CLSCTX_REMOTE_SERVER;
/* What is server name? A String or an array? */ /* What is server name? A String or an array? */
if (Z_TYPE_P(server_name) == IS_ARRAY) { if (Z_TYPE_P(server_name) == IS_NULL) {
server_name = NULL;
} else if (Z_TYPE_P(server_name) == IS_ARRAY) {
pval **tmp; pval **tmp;
/* DAB: 22 Sept 2001 */ /* DAB: 22 Sept 2001 */
/* Aha - we have a number of possible */ /* Aha - we have a number of possible */
@ -568,14 +565,12 @@ PHP_FUNCTION(com_load)
convert_to_long_ex(tmp); convert_to_long_ex(tmp);
flags = (CLSCTX) Z_LVAL_PP(tmp); flags = (CLSCTX) Z_LVAL_PP(tmp);
} }
}
if (Z_TYPE_P(server_name) == IS_NULL) {
server_name = NULL;
} else { } else {
if (!INI_INT("com.allow_dcom")) { if (!INI_INT("com.allow_dcom")) {
php_error(E_WARNING, "DCOM is disabled"); php_error(E_WARNING, "DCOM is disabled");
RETURN_FALSE; RETURN_FALSE;
} else { } else {
flags = CLSCTX_REMOTE_SERVER;
convert_to_string_ex(&server_name); convert_to_string_ex(&server_name);
} }
} }