Make sure to load the class for object variance

nikic · nikic · commit 7a7896dd456c · 2019-03-26T16:46:57.000+01:00
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c
@@ -320,7 +320,8 @@ _inheritance_status _check_covariance(
 				code = INHERITANCE_UNRESOLVED;
 			}
 		} else if (proto_type_code == IS_OBJECT) {
-			code = INHERITANCE_SUCCESS;
+			zend_class_entry *fe_ce = lookup_class(fe_class_name);
+			code = fe_ce ? INHERITANCE_SUCCESS : INHERITANCE_UNRESOLVED;
 		} else {
 			code = INHERITANCE_ERROR;
 		}

Original file line number	Diff line number	Diff line change
`@@ -320,7 +320,8 @@ _inheritance_status _check_covariance(`
`320`	`320`	`code = INHERITANCE_UNRESOLVED;`
`321`	`321`	`}`
`322`	`322`	`} else if (proto_type_code == IS_OBJECT) {`
`323`		`- code = INHERITANCE_SUCCESS;`
	`323`	`+ zend_class_entry *fe_ce = lookup_class(fe_class_name);`
	`324`	`+ code = fe_ce ? INHERITANCE_SUCCESS : INHERITANCE_UNRESOLVED;`
`324`	`325`	`} else {`
`325`	`326`	`code = INHERITANCE_ERROR;`
`326`	`327`	`}`