PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-06 04:31:29 +00:00
Code Issues Projects Releases Wiki Activity

Avoid copying script results; store pointers instead.

Browse Source
This commit is contained in:
dmiller
2021-04-29 17:52:24 +00:00
parent c3a2faaa7b
commit f17fa67008
7 changed files with 38 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
output.cc
View File

@@ -446,7 +446,7 @@ std::string protect_xml(const std::string s) {
return r;
}
static char *formatScriptOutput(const ScriptResult &sr) {
static char *formatScriptOutput(const ScriptResult *sr) {
std::vector<std::string> lines;
std::string c_output;
@@ -454,7 +454,7 @@ static char *formatScriptOutput(const ScriptResult &sr) {
std::string result;
unsigned int i;
c_output = escape_for_screen(sr.get_output_str());
c_output = escape_for_screen(sr->get_output_str());
if (c_output.empty())
return NULL;
p = c_output.c_str();
@@ -478,7 +478,7 @@ static char *formatScriptOutput(const ScriptResult &sr) {
else
result += "|_";
if (i == 0)
result += std::string(sr.get_id()) + ": ";
result += std::string(sr->get_id()) + ": ";
result += lines[i];
if (i < lines.size() - 1)
result += "\n";
@@ -806,7 +806,7 @@ void printportoutput(const Target *currenths, const PortList *plist) {
ScriptResults::const_iterator ssr_iter;
for (ssr_iter = current->scriptResults.begin();
ssr_iter != current->scriptResults.end(); ssr_iter++) {
ssr_iter->write_xml();
(*ssr_iter)->write_xml();
char *script_output = formatScriptOutput((*ssr_iter));
if (script_output != NULL) {
@@ -2223,7 +2223,7 @@ void printscriptresults(const ScriptResults *scriptResults, stype scantype) {
log_write(LOG_PLAIN, "Post-scan script results:\n");
}
for (iter = scriptResults->begin(); iter != scriptResults->end(); iter++) {
iter->write_xml();
(*iter)->write_xml();
script_output = formatScriptOutput((*iter));
if (script_output != NULL) {
log_write(LOG_PLAIN, "%s\n", script_output);
@@ -2244,7 +2244,7 @@ void printhostscriptresults(const Target *currenths) {
for (iter = currenths->scriptResults.begin();
iter != currenths->scriptResults.end();
iter++) {
iter->write_xml();
(*iter)->write_xml();
script_output = formatScriptOutput((*iter));
if (script_output != NULL) {