generic-library/valijson
1
0
Fork 0
mirror of https://github.com/tristanpenman/valijson.git synced 2025-01-07 09:48:05 +01:00
Code Issues Projects Releases Wiki Activity

Fix format regex escape sequences

Browse Source
This commit is contained in:
Tristan Penman 2022-07-21 22:45:25 +10:00
parent 25dcdb1c3a
commit 94d3bfd39a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/valijson/validation_visitor.hpp
View File

@ -375,7 +375,7 @@ public:
} }
} else if (format == "time") { } else if (format == "time") {
// Matches times like: 16:52:45Z, 16:52:45+02:00 // Matches times like: 16:52:45Z, 16:52:45+02:00
std::regex time_regex("^([01][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9]|60)(\.[0-9]+)?(([Zz])|([\+|\-]([01][0-9]|2[0-3]):[0-5][0-9]))$"); std::regex time_regex("^([01][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9]|60)(\\.[0-9]+)?(([Zz])|([\\+|\\-]([01][0-9]|2[0-3]):[0-5][0-9]))$");
if (std::regex_match(s, time_regex)) { if (std::regex_match(s, time_regex)) {
return true; return true;
} else { } else {
@ -387,7 +387,7 @@ public:
} }
} else if (format == "date-time") { } else if (format == "date-time") {
// Matches data times like: 2022-07-18T16:52:45Z, 2022-07-18T16:52:45+02:00 // Matches data times like: 2022-07-18T16:52:45Z, 2022-07-18T16:52:45+02:00
std::regex datetime_regex("^([0-9]+)-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])[Tt]([01][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9]|60)(\.[0-9]+)?(([Zz])|([\+|\-]([01][0-9]|2[0-3]):[0-5][0-9]))$"); std::regex datetime_regex("^([0-9]+)-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])[Tt]([01][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9]|60)(\\.[0-9]+)?(([Zz])|([\\+|\\-]([01][0-9]|2[0-3]):[0-5][0-9]))$");
std::smatch matches; std::smatch matches;
if (std::regex_match(s, matches, datetime_regex)) { if (std::regex_match(s, matches, datetime_regex)) {
const auto month = std::stoi(matches[2].str()); const auto month = std::stoi(matches[2].str());