Patch fix-segfault-in-do_bind_inherited_class-error-printing for Scripting Engine problem Bug #70690

Patch version 2015-10-11 06:16 UTC

• 2015-10-11 06:16 UTC [diff to current]

Developer: tandre@ifwe.co

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 26655ad..8dda8c6 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -1035,7 +1035,7 @@ ZEND_API zend_class_entry *do_bind_inherited_class(const zend_op_array *op_array
 			 * so we shut up about it.  This allows the if (!defined('FOO')) { return; }
 			 * approach to work.
 			 */
-			zend_error_noreturn(E_COMPILE_ERROR, "Cannot declare %s %s, because the name is already in use", zend_get_object_type(Z_OBJCE_P(op2)), Z_STRVAL_P(op2));
+			zend_error_noreturn(E_COMPILE_ERROR, "Cannot declare %s %s, because the name is already in use", "trait/interface/class", Z_STRVAL_P(op2));
 		}
 		return NULL;
 	}