Fixes

Author: kocsismate

Zend/zend_execute.c

@@ -832,6 +832,11 @@ ZEND_COLD zend_never_inline void zend_verify_class_constant_type_error(const zen
 {
 	zend_string *type_str = zend_type_to_string(c->type);
 
+	/* we _may_ land here in case reading already errored and runtime cache thus has not been updated (i.e. it contains a valid but unrelated info) */
+	if (EG(exception)) {
+		return;
+	}
+
 	zend_type_error("Cannot assign %s to class constant %s::%s of type %s",
 		zend_zval_type_name(constant), ZSTR_VAL(c->ce->name), ZSTR_VAL(c->name), ZSTR_VAL(type_str));
 

Zend/zend_vm_def.h

@@ -5948,6 +5948,7 @@ ZEND_VM_HANDLER(181, ZEND_FETCH_CLASS_CONSTANT, VAR|CONST|UNUSED|CLASS_FETCH, CO
 			if (UNEXPECTED(!(c->ce->ce_flags & ZEND_ACC_CONSTANTS_UPDATED))) {
 				if (UNEXPECTED(zend_update_class_constants(c->ce)) != SUCCESS) {
 					ZVAL_UNDEF(EX_VAR(opline->result.var));
+					FREE_OP2();
 					HANDLE_EXCEPTION();
 				}
 			}
@@ -5970,7 +5971,6 @@ ZEND_VM_HANDLER(181, ZEND_FETCH_CLASS_CONSTANT, VAR|CONST|UNUSED|CLASS_FETCH, CO
 				}
 			}
 			if (OP2_TYPE == IS_CONST) {
-				value = &c->value;
 				CACHE_POLYMORPHIC_PTR(opline->extended_value, ce, value);
 			}
 		} else {