CERBERUS/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-09-01 16:02:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Prevent backslash-escaping of CR characters in XML output. Fixes #1648

Browse source
This commit is contained in:
nnposter 2019-07-21 00:44:32 +00:00
parent 5f5c8b32f6
commit 7e9cf65489
2 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG
View file

@ -1,5 +1,8 @@
#Nmap Changelog ($Id$); -*-text-*-
o [NSE][GH#1648] CR characters are no longer treated as illegal in script XML
output. [nnposter]
o [GH#1659] Allow resuming nmap scan with lengthy command line
[Clément Notin]

17
output.cc
View file

@ -493,8 +493,21 @@ static std::string escape_for_screen(const std::string s) {
xml_write_escaped is not enough; some characters are not allowed to appear in
XML, not even escaped. */
std::string protect_xml(const std::string s) {
/* escape_for_screen is good enough. */
return escape_for_screen(s);
std::string r;
for (unsigned int i = 0; i < s.size(); i++) {
char buf[5];
unsigned char c = s[i];
// Printable and some whitespace ok.
if (c == '\t' || c == '\r' || c == '\n' || (0x20 <= c && c <= 0x7e)) {
r += c;
} else {
Snprintf(buf, sizeof(buf), "\\x%02X", c);
r += buf;
}
}
return r;
}
/* This is a helper function to determine the ordering of the script results