mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-30 21:45:37 +00:00
Code Issues Releases Wiki Activity

[4091] Changed to require at least one hexdigit

Browse Source
This commit is contained in:
Francis Dupont
2015-11-05 23:32:15 +01:00
parent a496523c86
commit 5c780bdd6e
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/lib/eval/token.cc
View File

@@ -29,19 +29,14 @@ TokenString::evaluate(const Pkt& /*pkt*/, ValueStack& values) {
} }
TokenHexString::TokenHexString(const string& str) : value_("") { TokenHexString::TokenHexString(const string& str) : value_("") {
// Check "0x" or "0x" in front // Check string starts "0x" or "0x" and has at least one additional character.
if ((str.size() < 2) || if ((str.size() < 3) ||
(str[0] != '0') || (str[0] != '0') ||
((str[1] != 'x') && (str[1] != 'X'))) { ((str[1] != 'x') && (str[1] != 'X'))) {
return; return;
} }
string digits = str.substr(2); string digits = str.substr(2);
// Eliminate the no digit case first
if (digits.empty()) {
return;
}
// Transform string of hexadecimal digits into binary format // Transform string of hexadecimal digits into binary format
vector<uint8_t> binary; vector<uint8_t> binary;
try { try {