mirror of
https://github.com/nmap/nmap.git
synced 2026-01-04 13:49:03 +00:00
merge soc07 r4862 - Rearrange some reason-setting code to avoid using deallocated memory.
This commit is contained in:
@@ -2688,8 +2688,8 @@ static bool do_one_select_round(UltraScanInfo *USI, struct timeval *stime) {
|
||||
if (probe->isPing())
|
||||
ultrascan_ping_update(USI, host, probeI, &USI->now);
|
||||
else {
|
||||
ultrascan_port_probe_update(USI, host, probeI, newstate, &USI->now);
|
||||
host->target->ports.setStateReason(probe->dport(), probe->protocol(), current_reason, 0, 0);
|
||||
ultrascan_port_probe_update(USI, host, probeI, newstate, &USI->now);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -3158,13 +3158,13 @@ static bool get_pcap_result(UltraScanInfo *USI, struct timeval *stime) {
|
||||
if (probe->isPing())
|
||||
ultrascan_ping_update(USI, hss, probeI, &rcvdtime);
|
||||
else {
|
||||
ultrascan_port_probe_update(USI, hss, probeI, newstate, &rcvdtime);
|
||||
if(USI->prot_scan)
|
||||
hss->target->ports.setStateReason(probe->protocol(), IPPROTO_IP,
|
||||
current_reason, ip->ip_ttl, reason_sip);
|
||||
else
|
||||
hss->target->ports.setStateReason(probe->dport(), probe->protocol(),
|
||||
current_reason, ip->ip_ttl, reason_sip);
|
||||
ultrascan_port_probe_update(USI, hss, probeI, newstate, &rcvdtime);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user