github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-11-16 17:41:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

Replace usage of range-checked 'at' method when vector/string has already been size checked

Browse Source
This commit is contained in:
Eduardo Arias
2024-06-02 20:07:19 +00:00
parent 99ce9779e6
commit 0613ceeb75
11 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/utils/string.h
View File

@@ -107,12 +107,12 @@ inline std::string toHexIfNeeded(const std::string &str, bool escape_spec = fals
// spec chars: '"' (quotation mark, ascii 34), '\' (backslash, ascii 92)
std::stringstream res;
for (int i = 0; i < str.size(); i++) {
int c = (unsigned char)str.at(i);
for (const auto ch : str) {
int c = (unsigned char)ch;
if (c < 32 || c > 126 || (escape_spec == true && (c == 34 || c == 92))) {
res << "\\x" << std::setw(2) << std::setfill('0') << std::hex << c;
} else {
res << str.at(i);
res << ch;
}
}
@@ -177,10 +177,10 @@ inline void replaceAll(std::string &str, std::string_view from,
inline std::string removeWhiteSpacesIfNeeded(std::string a) {
while (a.size() > 1 && a.at(0) == ' ') {
while (a.size() > 1 && a.front() == ' ') {
a.erase(0, 1);
}
while (a.size() > 1 && a.at(a.length()-1) == ' ') {
while (a.size() > 1 && a.back() == ' ') {
a.pop_back();
}
return a;
@@ -188,11 +188,11 @@ inline std::string removeWhiteSpacesIfNeeded(std::string a) {
inline std::string removeBracketsIfNeeded(std::string a) {
if (a.length() > 1 && a.at(0) == '"' && a.at(a.length()-1) == '"') {
if (a.length() > 1 && a.front() == '"' && a.back() == '"') {
a.pop_back();
a.erase(0, 1);
}
if (a.length() > 1 && a.at(0) == '\'' && a.at(a.length()-1) == '\'') {
if (a.length() > 1 && a.front() == '\'' && a.back() == '\'') {
a.pop_back();
a.erase(0, 1);
}