- Made eval() and several other runtime-evaluated code portions report the

  nature and location of errors more accurately (Stas)

1 files changed, 5 insertions, 1 deletions

diff --git a/ext/standard/assert.c b/ext/standard/assert.c
index facd41548f..ce68c89360 100644
--- a/ext/standard/assert.c
+++ b/ext/standard/assert.c
@@ -138,6 +138,7 @@ PHP_FUNCTION(assert)
 	int val;
 	char *myeval = NULL;
 	char *cbfunc;
+	char *compiled_string_description;
 	CLS_FETCH();
 	ASSERTLS_FETCH();
 	
@@ -160,10 +161,13 @@ PHP_FUNCTION(assert)
 			EG(error_reporting) = 0;
 		}
 
-		if (zend_eval_string(myeval, &retval CLS_CC ELS_CC) == FAILURE) {
+		compiled_string_description = zend_make_compiled_string_description("assert code");
+		if (zend_eval_string(myeval, &retval, compiled_string_description CLS_CC ELS_CC) == FAILURE) {
+			efree(compiled_string_description);
 			zend_error(E_ERROR, "Failure evaluating code:\n%s\n", myeval);
 			/* zend_error() does not return in this case. */
 		}
+		efree(compiled_string_description);
 
 		if (ASSERT(quiet_eval)) {
 			EG(error_reporting) = old_error_reporting;