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

Make str2AVal not modify its argument.

Browse Source 
This is nice for its own sake, but it's really so that the error message
makes sense. The string had had a bunch of '\0' bytes inserted and the
string in the error message didn't match the argument.
This commit is contained in:
david
2011-07-26 20:48:03 +00:00
parent 08509380d6
commit 13a31a8cb9
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
osscan.cc
View File

@@ -680,10 +680,10 @@ error:
return -1;
}
static std::vector<struct AVal> str2AVal(char *str) {
static std::vector<struct AVal> str2AVal(const char *str) {
int i = 1;
int count = 1;
char *q = str, *p=str;
const char *q = str, *p=str;
std::vector<struct AVal> AVs;
if (!*str)
@@ -703,17 +703,17 @@ static std::vector<struct AVal> str2AVal(char *str) {
if (!q) {
fatal("Parse error with AVal string (%s) in nmap-os-db file", str);
}
*q = '\0';
av.attribute = string_pool_insert(p);
av.attribute = string_pool_substr(p, q);
p = q+1;
if (i != count - 1) {
if (i < count - 1) {
q = strchr(p, '%');
if (!q) {
fatal("Parse error with AVal string (%s) in nmap-os-db file", str);
}
*q = '\0';
av.value = string_pool_substr(p, q);
} else {
av.value = string_pool_insert(p);
}
av.value = string_pool_insert(p);
p = q + 1;
AVs.push_back(av);
}