From 3f2f00900aaa54a4ba0d7a4d0fd1cc5592592675 Mon Sep 17 00:00:00 2001
From: fyodor <fyodor@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Sat, 11 Aug 2007 03:30:38 +0000
Subject: [PATCH] merge soc07 r4799 - NSE formatScriptOutput() function uses
 strtok which has side effects on its argument.

---
 output.cc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/output.cc b/output.cc
index a64bb6abf..5864bd18f 100644
--- a/output.cc
+++ b/output.cc
@@ -680,12 +680,12 @@ void printportoutput(Target *currenths, PortList *plist) {
 		for(	ssr_iter = current->scriptResults.begin(); 
 			ssr_iter != current->scriptResults.end(); 
 			ssr_iter++) {
-			char* script_output = formatScriptOutput((*ssr_iter));
-	
-			Tbl->addItem(rowno, 0, true, true, script_output);
-			free(script_output);
 			log_write(LOG_XML, "<script id=\"%s\" output=\"%s\" />", 
 					(*ssr_iter).id, (*ssr_iter).output);
+
+			char* script_output = formatScriptOutput((*ssr_iter));
+			Tbl->addItem(rowno, 0, true, true, script_output);
+			free(script_output);
 			rowno++;
 		}
 		
@@ -1701,10 +1701,10 @@ void printhostscriptresults(Target *currenths) {
 		log_write(LOG_XML, "<hostscript>");
 		log_write(LOG_NORMAL|LOG_SKID|LOG_STDOUT, "\nHost script results:\n");
 		for(iter = currenths->scriptResults.begin(); iter != currenths->scriptResults.end(); iter++) {
-			script_output = formatScriptOutput((*iter));
-			log_write(LOG_NORMAL|LOG_SKID|LOG_STDOUT, "%s\n", script_output);
 			log_write(LOG_XML, "<script id=\"%s\" output=\"%s\" />", 
 					(*iter).id, (*iter).output);
+			script_output = formatScriptOutput((*iter));
+			log_write(LOG_NORMAL|LOG_SKID|LOG_STDOUT, "%s\n", script_output);
 		}
 		log_write(LOG_XML, "</hostscript>");
 	}