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

Fix -sU modifying payloads when retrieving them. Closes #2269. Fixes #2268

Browse Source
This commit is contained in:
dmiller
2021-04-22 23:22:46 +00:00
parent 004c8627c1
commit a744a969da
2 changed files with 4 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-*- #Nmap Changelog ($Id$); -*-text-*-
o [GH#2269] Fix an issue with -sU where payloads were modified when retrieving
them, causing later payloads to not be sent. [Mariusz Ziulek]
o [GH#2257] Fix an issue in addrset matching that was causing all targets to be o [GH#2257] Fix an issue in addrset matching that was causing all targets to be
excluded if the --excludefile listed a CIDR range that contains an earlier, excluded if the --excludefile listed a CIDR range that contains an earlier,
smaller CIDR range. [Daniel Miller] smaller CIDR range. [Daniel Miller]

3
payload.cc
View File

@@ -315,7 +315,6 @@ int init_payloads(void) {
const char *udp_port2payload(u16 dport, size_t *length, u8 tryno) { const char *udp_port2payload(u16 dport, size_t *length, u8 tryno) {
static const char *payload_null = ""; static const char *payload_null = "";
std::map<struct proto_dport, std::vector<struct payload> >::iterator portPayloadIterator; std::map<struct proto_dport, std::vector<struct payload> >::iterator portPayloadIterator;
std::vector<struct payload> portPayloadVector;
std::vector<struct payload>::iterator portPayloadVectorIterator; std::vector<struct payload>::iterator portPayloadVectorIterator;
proto_dport key(IPPROTO_UDP, dport); proto_dport key(IPPROTO_UDP, dport);
int portPayloadVectorSize; int portPayloadVectorSize;
@@ -323,7 +322,7 @@ const char *udp_port2payload(u16 dport, size_t *length, u8 tryno) {
portPayloadIterator = portPayloads.find(key); portPayloadIterator = portPayloads.find(key);
if (portPayloadIterator != portPayloads.end()) { if (portPayloadIterator != portPayloads.end()) {
portPayloadVector = portPayloads.find(key)->second; std::vector<struct payload>& portPayloadVector = portPayloads.find(key)->second;
portPayloadVectorSize = portPayloadVector.size(); portPayloadVectorSize = portPayloadVector.size();
tryno %= portPayloadVectorSize; tryno %= portPayloadVectorSize;