From d4e9bb339360cb7d6ece5b1b60c08c8611bac19c Mon Sep 17 00:00:00 2001
From: Ben Fuhrmannek
Date: Wed, 24 Feb 2016 23:33:34 +0100
Subject: executor improvements

---
 log.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'log.c')

diff --git a/log.c b/log.c
index 5b14c61..67e37b4 100644
--- a/log.c
+++ b/log.c
@@ -158,22 +158,22 @@ SUHOSIN7_API void suhosin_log(int loglevel, char *fmt, ...)
 	}
 	
 	if (zend_is_executing()) {
-		zend_execute_data *exdata = EG(current_execute_data);
-		if (exdata) {
-			if (getcaller && exdata->prev_execute_data && exdata->prev_execute_data->opline && exdata->prev_execute_data->func) {
-				lineno = exdata->prev_execute_data->opline->lineno;
-				fname = (char *)ZSTR_VAL(exdata->prev_execute_data->func->op_array.filename);
-			} else if (exdata->opline && exdata->func) {
-				lineno = exdata->opline->lineno;
-				fname = (char *)ZSTR_VAL(exdata->func->op_array.filename);
-			} else {
-				lineno = 0;
-				fname = "[unknown filename]";
-			}
-		} else {
+		// zend_execute_data *exdata = EG(current_execute_data);
+		// if (exdata) {
+		// 	if (getcaller && exdata->prev_execute_data && exdata->prev_execute_data->opline && exdata->prev_execute_data->func) {
+		// 		lineno = exdata->prev_execute_data->opline->lineno;
+		// 		fname = (char *)ZSTR_VAL(exdata->prev_execute_data->func->op_array.filename);
+		// 	} else if (exdata->opline && exdata->func) {
+		// 		lineno = exdata->opline->lineno;
+		// 		fname = (char *)ZSTR_VAL(exdata->func->op_array.filename);
+		// 	} else {
+		// 		lineno = 0;
+		// 		fname = "[unknown filename]";
+		// 	}
+		// } else {
 			lineno = zend_get_executed_lineno();
 			fname = (char *)zend_get_executed_filename();
-		}
+		// }
 		ap_php_snprintf(buf, sizeof(buf), "%s - %s (attacker '%s', file '%s', line %u)", alertstring, error, ip_address, fname, lineno);
 	} else {
 		fname = suhosin_getenv("SCRIPT_FILENAME", 15);
-- 
cgit v1.3