From: Dmitry Stogov <dmitry@zend.com>
Date: Tue, 18 Sep 2018 13:49:58 +0000 (+0300)
Subject: Fixed crashes in ZTS build introduced by 689c6fb188c9dfe5e428492b4b80f8d6f586a7e5
X-Git-Tag: php-7.4.0alpha1~1869
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2df91cb5190018e0340c869abd6dbda553a97acb;p=php

Fixed crashes in ZTS build introduced by 689c6fb188c9dfe5e428492b4b80f8d6f586a7e5
---

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 69f09fa078..a9c736e752 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -6349,13 +6349,13 @@ void zend_compile_class_decl(zend_ast *ast, zend_bool toplevel) /* {{{ */
 				) {
 				if (EXPECTED(zend_hash_add_ptr(CG(class_table), lcname, ce) != NULL)) {
 					CG(zend_lineno) = decl->end_lineno;
+					ce->ce_flags |= ZEND_ACC_LINKED;
 					zend_do_inheritance(ce, parent_ce);
 					if ((ce->ce_flags & (ZEND_ACC_IMPLICIT_ABSTRACT_CLASS|ZEND_ACC_INTERFACE|ZEND_ACC_TRAIT|ZEND_ACC_EXPLICIT_ABSTRACT_CLASS)) == ZEND_ACC_IMPLICIT_ABSTRACT_CLASS) {
 						zend_verify_abstract_class(ce);
 					}
 					CG(zend_lineno) = ast->lineno;
 					zend_string_release(lcname);
-					ce->ce_flags |= ZEND_ACC_LINKED;
 					return;
 				}
 			}