- More fixes to check for member/function call legality.

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 6ff52c25ff0f608052b599e23b2a0cb0525a2d2e..e9cb8ccbac0f07544f624662ddb856944c40c0ca 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -1355,7 +1355,7 @@ void zend_do_return(znode *expr, int do_end_vparse TSRMLS_DC)
        zend_op *opline;
        
        if (do_end_vparse) {
-               if (CG(active_op_array)->return_reference) {
+               if (CG(active_op_array)->return_reference && !zend_is_function_or_method_call(expr)) {
                        zend_do_end_variable_parse(BP_VAR_W, 0 TSRMLS_CC);
                } else {
                        zend_do_end_variable_parse(BP_VAR_R, 0 TSRMLS_CC);

diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index 7d0f20fb0227bcca5d7c2614c7c583f837ccd3d9..627db9ae373a640733901b76d0fbc35d3c684d18 100644 (file)
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -194,7 +194,7 @@ unticked_statement:
        |       T_CONTINUE expr ';'             { zend_do_brk_cont(ZEND_CONT, &$2 TSRMLS_CC); }
        |       T_RETURN ';'                                            { zend_do_return(NULL, 0 TSRMLS_CC); }
        |       T_RETURN expr_without_variable ';'      { zend_do_return(&$2, 0 TSRMLS_CC); }
-       |       T_RETURN cvar ';'                                       { zend_do_return(&$2, 1 TSRMLS_CC); }
+       |       T_RETURN variable ';'                           { zend_do_return(&$2, 1 TSRMLS_CC); }
        |       T_GLOBAL global_var_list ';'
        |       T_STATIC static_var_list ';'
        |       T_ECHO echo_expr_list ';'
@@ -389,10 +389,10 @@ function_call_parameter_list:
 
 non_empty_function_call_parameter_list:
                expr_without_variable   { $$.u.constant.value.lval = 1;  zend_do_pass_param(&$1, ZEND_SEND_VAL, $$.u.constant.value.lval TSRMLS_CC); }
-       |       cvar                                    { $$.u.constant.value.lval = 1;  zend_do_pass_param(&$1, ZEND_SEND_VAR, $$.u.constant.value.lval TSRMLS_CC); }
+       |       variable                                { $$.u.constant.value.lval = 1;  zend_do_pass_param(&$1, ZEND_SEND_VAR, $$.u.constant.value.lval TSRMLS_CC); }
        |       '&' w_cvar                              { $$.u.constant.value.lval = 1;  zend_do_pass_param(&$2, ZEND_SEND_REF, $$.u.constant.value.lval TSRMLS_CC); }
        |       non_empty_function_call_parameter_list ',' expr_without_variable        { $$.u.constant.value.lval=$1.u.constant.value.lval+1;  zend_do_pass_param(&$3, ZEND_SEND_VAL, $$.u.constant.value.lval TSRMLS_CC); }
-       |       non_empty_function_call_parameter_list ',' cvar                                         { $$.u.constant.value.lval=$1.u.constant.value.lval+1;  zend_do_pass_param(&$3, ZEND_SEND_VAR, $$.u.constant.value.lval TSRMLS_CC); }
+       |       non_empty_function_call_parameter_list ',' variable                                     { $$.u.constant.value.lval=$1.u.constant.value.lval+1;  zend_do_pass_param(&$3, ZEND_SEND_VAR, $$.u.constant.value.lval TSRMLS_CC); }
        |       non_empty_function_call_parameter_list ',' '&' w_cvar                           { $$.u.constant.value.lval=$1.u.constant.value.lval+1;  zend_do_pass_param(&$4, ZEND_SEND_REF, $$.u.constant.value.lval TSRMLS_CC); }
 ;