Merge branch 'PHP-5.5'

dsp · dsp · commit a496e62f1342 · 2013-06-24T17:22:02.000+02:00
* PHP-5.5:
  Fix #65108 (is_callable() triggers Fatal Error)
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
@@ -2842,7 +2842,7 @@ static int zend_is_callable_check_func(int check_flags, zval *callable, zend_fca
 		}
 		if ((check_flags & IS_CALLABLE_CHECK_NO_ACCESS) == 0 &&
 		    (fcc->calling_scope &&
-		     (fcc->calling_scope->__call ||
+		     ((fcc->calling_scope->__call && fcc->object_ptr) ||
 		      fcc->calling_scope->__callstatic))) {
 			if (fcc->function_handler->op_array.fn_flags & ZEND_ACC_PRIVATE) {
 				if (!zend_check_private(fcc->function_handler, fcc->object_ptr ? Z_OBJCE_P(fcc->object_ptr) : EG(scope), lmname, mlen TSRMLS_CC)) {

Original file line number	Diff line number	Diff line change
`@@ -2842,7 +2842,7 @@ static int zend_is_callable_check_func(int check_flags, zval *callable, zend_fca`
`2842`	`2842`	`}`
`2843`	`2843`	`if ((check_flags & IS_CALLABLE_CHECK_NO_ACCESS) == 0 &&`
`2844`	`2844`	`(fcc->calling_scope &&`
`2845`		`- (fcc->calling_scope->__call \|\|`
	`2845`	`+ ((fcc->calling_scope->__call && fcc->object_ptr) \|\|`
`2846`	`2846`	`fcc->calling_scope->__callstatic))) {`
`2847`	`2847`	`if (fcc->function_handler->op_array.fn_flags & ZEND_ACC_PRIVATE) {`
`2848`	`2848`	`if (!zend_check_private(fcc->function_handler, fcc->object_ptr ? Z_OBJCE_P(fcc->object_ptr) : EG(scope), lmname, mlen TSRMLS_CC)) {`