Fixed bug #71442 (forward_static_call crash)

Author: laruence

NEWS

@@ -3,6 +3,7 @@ PHP NEWS
 ?? ??? 2016 PHP 7.0.4
 
 - Core:
+ . Fixed bug #71442 (forward_static_call crash). (Laruence)
  . Fixed bug #71441 (Typehinted Generator with return in try/finally crashes).
  (Bob)
 

ext/standard/basic_functions.c

@@ -4835,7 +4835,7 @@ PHP_FUNCTION(forward_static_call)
 fci.retval = &retval;
 
 called_scope = zend_get_called_scope(execute_data);
-if (called_scope &&
+if (called_scope && fci_cache.calling_scope &&
 instanceof_function(called_scope, fci_cache.calling_scope)) {
 fci_cache.called_scope = called_scope;
 }
@@ -4863,7 +4863,7 @@ PHP_FUNCTION(forward_static_call_array)
 fci.retval = &retval;
 
 called_scope = zend_get_called_scope(execute_data);
-if (called_scope &&
+if (called_scope && fci_cache.calling_scope &&
 instanceof_function(called_scope, fci_cache.calling_scope)) {
 fci_cache.called_scope = called_scope;
 }

ext/standard/tests/class_object/bug71442.phpt

@@ -0,0 +1,37 @@
+--TEST--
+Bug #71442 (forward_static_call crash)
+--FILE--
+<?php
+
+class A
+{
+const NAME = 'A';
+public static function test() {
+$args = func_get_args();
+echo static::NAME, " ".join(',', $args)." \n";
+}
+}
+
+class B extends A
+{
+const NAME = 'B';
+
+public static function test() {
+echo self::NAME, "\n";
+forward_static_call(array('A', 'test'), 'more', 'args');
+forward_static_call( 'test', 'other', 'args');
+}
+}
+
+B::test('foo');
+
+function test() {
+$args = func_get_args();
+echo "C ".join(',', $args)." \n";
+}
+
+?>
+--EXPECT--
+B
+B more,args 
+C other,args