Fix private handling

smalyshev · smalyshev · commit 2461c9403b2d · 2002-10-20T17:46:16.000Z
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
@@ -2199,8 +2199,8 @@ void zend_do_fetch_property(znode *result, znode *object, znode *property TSRMLS
 					break;
 			}
 
-			if (CG(active_class_entry) && (opline_ptr->op1.op_type == IS_CONST)) {
-				if (zend_hash_exists(&CG(active_class_entry)->private_properties, opline_ptr->op1.u.constant.value.str.val, opline_ptr->op1.u.constant.value.str.len+1)) {
+			if (CG(active_class_entry) && (opline_ptr->op2.op_type == IS_CONST)) {
+				if (zend_hash_exists(&CG(active_class_entry)->private_properties, opline_ptr->op2.u.constant.value.str.val, opline_ptr->op2.u.constant.value.str.len+1)) {
 					char *priv_name;
 					int priv_name_length;
                                         

Original file line number	Diff line number	Diff line change
`@@ -2199,8 +2199,8 @@ void zend_do_fetch_property(znode result, znode object, znode *property TSRMLS`
`2199`	`2199`	`break;`
`2200`	`2200`	`}`
`2201`	`2201`
`2202`		`- if (CG(active_class_entry) && (opline_ptr->op1.op_type == IS_CONST)) {`
`2203`		`- if (zend_hash_exists(&CG(active_class_entry)->private_properties, opline_ptr->op1.u.constant.value.str.val, opline_ptr->op1.u.constant.value.str.len+1)) {`
	`2202`	`+ if (CG(active_class_entry) && (opline_ptr->op2.op_type == IS_CONST)) {`
	`2203`	`+ if (zend_hash_exists(&CG(active_class_entry)->private_properties, opline_ptr->op2.u.constant.value.str.val, opline_ptr->op2.u.constant.value.str.len+1)) {`
`2204`	`2204`	`char *priv_name;`
`2205`	`2205`	`int priv_name_length;`
`2206`	`2206`