mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-01 14:35:29 +00:00
Code Issues Releases Wiki Activity

[950-harden-deferred-unpack] Hardened deffered unpacking so it no longer throws

Browse Source
This commit is contained in:
Francis Dupont
2019-10-12 22:46:39 +02:00
parent 2321173c63
commit 68df26f36e
5 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/bin/dhcp4/dhcp4_srv.cc
View File

@@ -3598,14 +3598,28 @@ Dhcpv4Srv::deferredUnpack(Pkt4Ptr& query)
OptionPtr opt = query->getOption(code);
if (!opt) {
// should not happen but do not crash anyway
LOG_DEBUG(bad_packet4_logger, DBG_DHCP4_DETAIL,
DHCP4_PACKET_OPTION_UNPACK_FAIL)
.arg(code)
.arg("can't find the option in the query");
continue;
}
const OptionBuffer buf = opt->getData();
try {
// Unpack the option
opt = def->optionFactory(Option::V4, code, buf);
} catch (const std::exception& e) {
// Failed to parse the option.
LOG_DEBUG(bad_packet4_logger, DBG_DHCP4_DETAIL,
DHCP4_PACKET_OPTION_UNPACK_FAIL)
.arg(code)
.arg(e.what());
continue;
}
while (query->delOption(code)) {
// continue
}
// Unpack the option and add it
opt = def->optionFactory(Option::V4, code, buf.cbegin(), buf.cend());
// Add the unpacked option.
query->addOption(opt);
}
}