Skip to content

Refactor toHexIfNeeded for better string handling #3743

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JakubOnderka wants to merge 1 commit into
base: v3/master
Choose a base branch
from
Open

Refactor toHexIfNeeded for better string handling #3743

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions src/utils/string.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,18 +106,23 @@
inline std::string toHexIfNeeded(const std::string &str, bool escape_spec = false) {
// escape_spec: escape special chars or not
// spec chars: '"' (quotation mark, ascii 34), '\' (backslash, ascii 92)
std::stringstream res;

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;
static constexpr char hex[] = "0123456789abcdef";

std::string res;
res.reserve(str.size());

for (const char ch : str) {
const unsigned char c = static_cast<unsigned char>(ch);

Check warning on line 115 in src/utils/string.h

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Replace the redundant type with "auto". 


See more on https://sonarcloud.io/project/issues?id=owasp-modsecurity_ModSecurity&issues=AaGeO9679_L81x-M9oAJ&open=AaGeO9679_L81x-M9oAJ&pullRequest=3743
if (c < 32 || c > 126 || (escape_spec && (c == '"' || c == '\\'))) {
res += '\\';
res += 'x';
res += hex[c >> 4];

Check warning on line 119 in src/utils/string.h

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Use "std::byte" for byte-oriented data manipulation. 


See more on https://sonarcloud.io/project/issues?id=owasp-modsecurity_ModSecurity&issues=AaGeO9679_L81x-M9oAK&open=AaGeO9679_L81x-M9oAK&pullRequest=3743
res += hex[c & 0x0F];

Check warning on line 120 in src/utils/string.h

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Use "std::byte" for byte-oriented data manipulation. 


See more on https://sonarcloud.io/project/issues?id=owasp-modsecurity_ModSecurity&issues=AaGeO9679_L81x-M9oAL&open=AaGeO9679_L81x-M9oAL&pullRequest=3743
} else {
res << ch;
res += ch;
}
}

return res.str();
return res;
}


Expand Down
Loading