CERBERUS/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-08-04 06:40:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make parse_classline accept blank class lines like

Browse source 
Class  || |
This commit is contained in:
david 2008-06-07 03:22:00 +00:00
parent 6f9f79cabf
commit 51ae7d1f24
1 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

24
osscan.cc
View file

@ -828,27 +828,25 @@ static void parse_classline(FingerPrint *FP, char *thisline, int lineno,
}
// Trim any trailing whitespace
q--;
while(isspace(*q)) q--;
while(q >= p && isspace(*(--q)))
;
q++;
if (q < p) { fatal("Parse error on line %d of fingerprint: %s\n", lineno, thisline); }
FP->OS_class[*classno].OS_Vendor = (char *) cp_alloc(q - p + 1);
memcpy(FP->OS_class[*classno].OS_Vendor, p, q - p);
FP->OS_class[*classno].OS_Vendor[q - p] = '\0';
/* Next comes the OS Family */
p = q;
while(*p && !isalnum(*p)) p++;
while(*p && isspace(*p)) p++;
q = strchr(p, '|');
if (!q) {
fatal("Parse error on line %d of fingerprint: %s\n", lineno, thisline);
}
// Trim any trailing whitespace
q--;
while(isspace(*q)) q--;
while(q >= p && isspace(*(--q)))
;
q++;
if (q < p) { fatal("Parse error on line %d of fingerprint: %s\n", lineno, thisline); }
FP->OS_class[*classno].OS_Family = (char *) cp_alloc(q - p + 1);
memcpy(FP->OS_class[*classno].OS_Family, p, q - p);
FP->OS_class[*classno].OS_Family[q - p] = '\0';
@ -868,10 +866,9 @@ static void parse_classline(FingerPrint *FP, char *thisline, int lineno,
fatal("Parse error on line %d of fingerprint: %s\n", lineno, thisline);
}
// Trim any trailing whitespace
q--;
while(isspace(*q)) q--;
while(q >= p && isspace(*(--q)))
;
q++;
if (q < p) { fatal("Parse error on line %d of fingerprint: %s\n", lineno, thisline); }
FP->OS_class[*classno].OS_Generation = (char *) cp_alloc(q - p + 1);
memcpy(FP->OS_class[*classno].OS_Generation, p, q - p);
FP->OS_class[*classno].OS_Generation[q - p] = '\0';
@ -879,7 +876,7 @@ static void parse_classline(FingerPrint *FP, char *thisline, int lineno,
/* And finally the device type */
p = q;
while(*p && !isalnum(*p)) p++;
while(*p && !isspace(*p)) p++;
q = strchr(p, '|');
if (!q) {
@ -888,10 +885,9 @@ static void parse_classline(FingerPrint *FP, char *thisline, int lineno,
}
// Trim any trailing whitespace
q--;
while(isspace(*q)) q--;
while(q >= p && isspace(*(--q)))
;
q++;
if (q < p) { fatal("Parse error on line %d of fingerprint: %s\n", lineno, thisline); }
FP->OS_class[*classno].Device_Type = (char *) cp_alloc(q - p + 1);
memcpy(FP->OS_class[*classno].Device_Type, p, q - p);
FP->OS_class[*classno].Device_Type[q - p] = '\0';