Merge branch 'PHP-5.4' into PHP-5.5

dstogov · dstogov · commit c3ebd6305ec4 · 2013-01-09T17:52:48.000+04:00
* PHP-5.4:
  Fixed compilator bug that might cause jump depended on unitialized value
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
@@ -4933,6 +4933,7 @@ void zend_do_begin_class_declaration(const znode *class_token, znode *class_name
 		/* Prefix class name with name of current namespace */
 		znode tmp;
 
+		tmp.op_type = IS_CONST;
 		tmp.u.constant = *CG(current_namespace);
 		zval_copy_ctor(&tmp.u.constant);
 		zend_do_build_namespace_name(&tmp, &tmp, class_name TSRMLS_CC);
@@ -5069,7 +5070,7 @@ void zend_do_end_class_declaration(const znode *class_token, const znode *parent
 	}
 
 	if (!(ce->ce_flags & (ZEND_ACC_INTERFACE|ZEND_ACC_EXPLICIT_ABSTRACT_CLASS))
-		&& ((parent_token->op_type != IS_UNUSED) || (ce->num_interfaces > 0))) {
+		&& (parent_token || (ce->num_interfaces > 0))) {
 		zend_verify_abstract_class(ce TSRMLS_CC);
 		if (ce->num_interfaces && !(ce->ce_flags & ZEND_ACC_IMPLEMENT_TRAITS)) {
 			do_verify_abstract_class(TSRMLS_C);
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
@@ -386,13 +386,13 @@ unticked_class_declaration_statement:
 			implements_list
 			'{'
 				class_statement_list
-			'}' { zend_do_end_class_declaration(&$1, &$2 TSRMLS_CC); }
+			'}' { zend_do_end_class_declaration(&$1, &$3 TSRMLS_CC); }
 	|	interface_entry T_STRING
 			{ zend_do_begin_class_declaration(&$1, &$2, NULL TSRMLS_CC); }
 			interface_extends_list
 			'{'
 				class_statement_list
-			'}' { zend_do_end_class_declaration(&$1, &$2 TSRMLS_CC); }
+			'}' { zend_do_end_class_declaration(&$1, NULL TSRMLS_CC); }
 ;
 
 
