Patch patch-for-NULL-access for COM related Bug #62475

Patch version 2013-02-20 11:45 UTC

• 2013-02-20 11:45 UTC [diff to current]

Developer: user@kkdf2.sakura.ne.jp

diff --git a/ext/com_dotnet/com_variant.c b/ext/com_dotnet/com_variant.c
index 853b7df..e870561 100644
--- a/ext/com_dotnet/com_variant.c
+++ b/ext/com_dotnet/com_variant.c
@@ -528,20 +528,20 @@ static void variant_binary_operation(enum variant_binary_opcode op, INTERNAL_FUN
 		obj = CDNO_FETCH(zright);
 		vright = &obj->v;
 	} else if (SUCCESS == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET,
-			ZEND_NUM_ARGS() TSRMLS_CC, "Oz!", &zleft, php_com_variant_class_entry,
+			ZEND_NUM_ARGS() TSRMLS_CC, "Oz", &zleft, php_com_variant_class_entry,
 			&zright)) {
 		obj = CDNO_FETCH(zleft);
 		vleft = &obj->v;
 		vright = &right_val;
 		php_com_variant_from_zval(vright, zright, codepage TSRMLS_CC);
 	} else if (SUCCESS == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET,
-			ZEND_NUM_ARGS() TSRMLS_CC, "z!O", &zleft, &zright, php_com_variant_class_entry)) {
+			ZEND_NUM_ARGS() TSRMLS_CC, "zO", &zleft, &zright, php_com_variant_class_entry)) {
 		obj = CDNO_FETCH(zright);
 		vright = &obj->v;
 		vleft = &left_val;
 		php_com_variant_from_zval(vleft, zleft, codepage TSRMLS_CC);
 	} else if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
-			"z!z!", &zleft, &zright)) {
+			"zz", &zleft, &zright)) {
 
 		vleft = &left_val;
 		php_com_variant_from_zval(vleft, zleft, codepage TSRMLS_CC);