summaryrefslogtreecommitdiff
path: root/ext/com/COM.c
diff options
context:
space:
mode:
authorHarald Radi <phanto@php.net>2001-08-14 11:50:16 +0000
committerHarald Radi <phanto@php.net>2001-08-14 11:50:16 +0000
commit0fbbadbd2f89f9f6ee952bd377b00f86f57157db (patch)
tree869cf0c187c6ef19028218724d7eb36c89bb4d96 /ext/com/COM.c
parent80277be8e31e7678141a2750d5de478967aa6d6a (diff)
downloadphp-git-0fbbadbd2f89f9f6ee952bd377b00f86f57157db.tar.gz
fixed bug in com_load_typelib
Diffstat (limited to 'ext/com/COM.c')
-rw-r--r--ext/com/COM.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/ext/com/COM.c b/ext/com/COM.c
index 775bf453bb..2f97d61737 100644
--- a/ext/com/COM.c
+++ b/ext/com/COM.c
@@ -1084,13 +1084,13 @@ PHP_FUNCTION(com_load_typelib)
{
pval *arg_typelib, *arg_cis;
ITypeLib *pTL;
- int mode;
+ int mode = CONST_CS; /* CONST_PERSISTENT|CONST_CS; */
switch (ZEND_NUM_ARGS()) {
case 1:
zend_get_parameters(ht, 1, &arg_typelib);
- mode = CONST_CS; /* CONST_PERSISTENT|CONST_CS; */
break;
+
case 2:
zend_get_parameters(ht, 2, &arg_typelib, &arg_cis);
convert_to_boolean_ex(&arg_cis);
@@ -1098,6 +1098,7 @@ PHP_FUNCTION(com_load_typelib)
mode &= ~CONST_CS;
}
break;
+
default:
ZEND_WRONG_PARAM_COUNT();
}
@@ -1292,7 +1293,8 @@ PHPAPI void php_COM_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_pro
int type;
if (zend_llist_count(property_reference->elements_list)==1
- && !strcmp(Z_STRVAL(function_name->element), "com")) { /* constructor */
+ && !strcmp(Z_STRVAL(function_name->element), "com")) {
+ /* constructor */
pval *object_handle;
PHP_FN(com_load)(INTERNAL_FUNCTION_PARAM_PASSTHRU);