CERBERUS/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-07-10 10:14:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reduce number of possible reallocs from slow services

Browse source
This commit is contained in:
dmiller 2026-05-26 18:56:45 +00:00
parent 947f53c079
commit 3cb27110dc
1 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
service_scan.cc
View file

@ -203,6 +203,7 @@ private:
std::vector<ServiceProbe *>::iterator current_probe;
u8 *currentresp;
int currentresplen;
int currentrespalloc;
char *servicefp;
int servicefplen;
int servicefpalloc;
@ -1621,7 +1622,7 @@ ServiceNFO::ServiceNFO(AllProbes *newAP) {
portno = proto = 0;
AP = newAP;
currentresp = NULL;
currentresplen = 0;
currentresplen = currentrespalloc = 0;
product_matched[0] = version_matched[0] = extrainfo_matched[0] = '\0';
hostname_matched[0] = ostype_matched[0] = devicetype_matched[0] = '\0';
cpe_a_matched[0] = cpe_h_matched[0] = cpe_o_matched[0] = '\0';
@ -1808,7 +1809,7 @@ bool dropdown = false;
// This invalidates the probe response string if any
if (newresp) {
if (currentresp) free(currentresp);
currentresp = NULL; currentresplen = 0;
currentresp = NULL; currentresplen = currentrespalloc = 0;
}
if (probe_state == PROBESTATE_INITIAL) {
@ -1889,7 +1890,7 @@ void ServiceNFO::resetProbes(bool freefp) {
servicefplen = servicefpalloc = 0;
}
currentresp = NULL; currentresplen = 0;
currentresp = NULL; currentresplen = currentrespalloc = 0;
probe_state = PROBESTATE_INITIAL;
}
@ -1923,7 +1924,16 @@ int ServiceNFO::probe_timemsleft(const ServiceProbe *probe, const struct timeval
}
void ServiceNFO::appendtocurrentproberesponse(const u8 *respstr, int respstrlen) {
currentresp = (u8 *) safe_realloc(currentresp, currentresplen + respstrlen);
size_t newlen = (size_t) currentresplen + respstrlen;
if (newlen > currentrespalloc) {
if (currentrespalloc == 0 || newlen >= 4096) {
currentrespalloc = newlen;
}
else {
currentrespalloc = newlen * 2;
}
currentresp = (u8 *) safe_realloc(currentresp, currentrespalloc);
}
memcpy(currentresp + currentresplen, respstr, respstrlen);
currentresplen += respstrlen;
}