php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-19 05:51:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.3'

Browse Source 
* PHP-7.3:
  Fixed bug #76869 (Incorrect bypassing protected method accessibilty check).
This commit is contained in:
Dmitry Stogov
2018-09-12 12:27:48 +03:00
parent beb3594eb8 655a99d131
commit 3444c260a2
2 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Zend/tests/bug76869.phpt Normal file
View File

@@ -0,0 +1,23 @@
--TEST--
Bug #76869 (Incorrect bypassing protected method accessibilty check)
--FILE--
<?php
class A {
private function f() {
return "A";
}
}
class B extends A {
protected function f() {
return "B";
}
}
$b = new B();
try {
var_dump($b->f());
} catch (Throwable $e) {
echo "Exception: ", $e->getMessage(), "\n";
}
?>
--EXPECT--
Exception: Call to protected method B::f() from context ''

17
Zend/zend_object_handlers.c
View File

@@ -1273,12 +1273,17 @@ ZEND_API zend_function *zend_std_get_method(zend_object **obj_ptr, zend_string *
*/
scope = zend_get_executed_scope();
if (fbc->op_array.fn_flags & ZEND_ACC_CHANGED) {
zend_function *priv_fbc = zend_get_parent_private(scope, fbc->common.scope, lc_method_name);
if (priv_fbc) {
fbc = priv_fbc;
do {
if (fbc->op_array.fn_flags & ZEND_ACC_CHANGED) {
zend_function *priv_fbc = zend_get_parent_private(scope, fbc->common.scope, lc_method_name);
if (priv_fbc) {
fbc = priv_fbc;
break;
} else if (!(fbc->op_array.fn_flags & ZEND_ACC_PROTECTED)) {
break;
}
}
} else {
/* Ensure that if we're calling a protected function, we're allowed to do so.
* If we're not and __call() handler exists, invoke it, otherwise error out.
*/
@@ -1290,7 +1295,7 @@ ZEND_API zend_function *zend_std_get_method(zend_object **obj_ptr, zend_string *
fbc = NULL;
}
}
}
} while (0);
}
if (UNEXPECTED(!key)) {