Skip to content

fix: f(char*) f(std::string) + replace c_str() with data() #1485

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

Merged
mehah merged 3 commits into from
Dec 23, 2025
Merged

fix: f(char*) f(std::string) + replace c_str() with data() #1485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d67dd0e
fix f(char*) f(std::string) + replace c_str() with data()
divinity76 Dec 13, 2025
82e26cd
msvc...
divinity76 Dec 16, 2025
629a4b0
Merge branch 'main' into more-data
divinity76 Dec 20, 2025
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
20 changes: 10 additions & 10 deletions src/framework/util/color.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,19 +163,19 @@ namespace {

static inline int parse_byte_or_percent(const std::string& s) {
if (!s.empty() && s.back() == '%') {
const double p = std::strtod(s.c_str(), nullptr);
const double p = std::strtod(s.data(), nullptr);
return clamp255(static_cast<int>(std::lround(p * 255.0 / 100.0)));
}
return clamp255(std::stoi(s));
}

static inline int parse_alpha_any(const std::string& s) {
if (!s.empty() && s.back() == '%') {
const double p = std::strtod(s.c_str(), nullptr);
const double p = std::strtod(s.data(), nullptr);
return clamp255(static_cast<int>(std::lround(p * 255.0 / 100.0)));
}
if (s.find_first_of(".eE") != std::string::npos) {
double f = std::strtod(s.c_str(), nullptr);
double f = std::strtod(s.data(), nullptr);
if (f < 0) f = 0; if (f > 1) f = 1;
return clamp255(static_cast<int>(std::lround(f * 255.0)));
}
Expand Down Expand Up @@ -222,7 +222,7 @@ namespace {

Color::Color(const std::string_view coltext)
{
std::stringstream ss(coltext.data());
std::stringstream ss((std::string(coltext)));
ss >> *this;
update();
}
Expand Down Expand Up @@ -263,19 +263,19 @@ std::istream& operator>>(std::istream& in, Color& color)

auto parse_byte_or_percent = [&](const std::string& s) {
if (!s.empty() && s.back() == '%') {
const double p = std::strtod(s.c_str(), nullptr);
const double p = std::strtod(s.data(), nullptr);
return clamp255(static_cast<int>(std::lround(p * 255.0 / 100.0)));
}
return clamp255(std::stoi(s));
};

auto parse_alpha_any = [&](const std::string& s) {
if (!s.empty() && s.back() == '%') {
const double p = std::strtod(s.c_str(), nullptr);
const double p = std::strtod(s.data(), nullptr);
return clamp255(static_cast<int>(std::lround(p * 255.0 / 100.0)));
}
if (s.find_first_of(".eE") != std::string::npos) {
double f = std::strtod(s.c_str(), nullptr);
double f = std::strtod(s.data(), nullptr);
if (f < 0) f = 0; if (f > 1) f = 1;
return clamp255(static_cast<int>(std::lround(f * 255.0)));
}
Expand Down Expand Up @@ -372,9 +372,9 @@ std::istream& operator>>(std::istream& in, Color& color)
if (o != std::string::npos && c != std::string::npos && c > o + 1) {
auto parts = split_commas(t.substr(o + 1, c - o - 1));
if ((!hasA && parts.size() == 3) || (hasA && parts.size() == 4)) {
const double h = std::strtod(parts[0].c_str(), nullptr);
const double h = std::strtod(parts[0].data(), nullptr);
auto pct = [](const std::string& s) {
const double v = std::strtod(s.c_str(), nullptr);
const double v = std::strtod(s.data(), nullptr);
return (!s.empty() && s.back() == '%') ? std::clamp(v / 100.0, 0.0, 1.0)
: std::clamp(v, 0.0, 1.0);
};
Expand Down Expand Up @@ -405,4 +405,4 @@ std::istream& operator>>(std::istream& in, Color& color)
}

return in;
}
}
28 changes: 14 additions & 14 deletions src/framework/util/crypt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,30 +164,30 @@ std::string Crypt::_decrypt(const std::string& encrypted_string, const bool useM
void Crypt::rsaSetPublicKey(const std::string& n, const std::string& e)
{
#ifdef USE_GMP
mpz_set_str(m_n, n.c_str(), 10);
mpz_set_str(m_e, e.c_str(), 10);
mpz_set_str(m_n, n.data(), 10);
mpz_set_str(m_e, e.data(), 10);
#else
BIGNUM* bn = nullptr, * be = nullptr;
BN_dec2bn(&bn, n.c_str());
BN_dec2bn(&be, e.c_str());
BN_dec2bn(&bn, n.data());
BN_dec2bn(&be, e.data());
RSA_set0_key(m_rsa, bn, be, nullptr);
#endif
}

void Crypt::rsaSetPrivateKey(const std::string& p, const std::string& q, const std::string& d)
{
#ifdef USE_GMP
mpz_set_str(m_p, p, 10);
mpz_set_str(m_q, q, 10);
mpz_set_str(m_d, d, 10);
mpz_set_str(m_p, p.data(), 10);
mpz_set_str(m_q, q.data(), 10);
mpz_set_str(m_d, d.data(), 10);

// n = p * q
mpz_mul(m_n, m_p, m_q);
#else
#if OPENSSL_VERSION_NUMBER < 0x10100005L
BN_dec2bn(&m_rsa->p, p);
BN_dec2bn(&m_rsa->q, q);
BN_dec2bn(&m_rsa->d, d);
BN_dec2bn(&m_rsa->p, p.data());
BN_dec2bn(&m_rsa->q, q.data());
BN_dec2bn(&m_rsa->d, d.data());
// clear rsa cache
if (m_rsa->_method_mod_p) {
BN_MONT_CTX_free(m_rsa->_method_mod_p);
Expand All @@ -199,9 +199,9 @@ void Crypt::rsaSetPrivateKey(const std::string& p, const std::string& q, const s
}
#else
BIGNUM* bp = nullptr, * bq = nullptr, * bd = nullptr;
BN_dec2bn(&bp, p.c_str());
BN_dec2bn(&bq, q.c_str());
BN_dec2bn(&bd, d.c_str());
BN_dec2bn(&bp, p.data());
BN_dec2bn(&bq, q.data());
BN_dec2bn(&bd, d.data());
RSA_set0_key(m_rsa, nullptr, nullptr, bd);
RSA_set0_factors(m_rsa, bp, bq);
#endif
Expand Down Expand Up @@ -275,7 +275,7 @@ int Crypt::rsaGetSize()
std::string Crypt::crc32(const std::string& decoded_string, const bool upperCase)
{
uint32_t crc = ::crc32(0, nullptr, 0);
crc = ::crc32(crc, (const Bytef*)decoded_string.c_str(), decoded_string.size());
crc = ::crc32(crc, reinterpret_cast<const Bytef*>(decoded_string.data()), decoded_string.size());
std::string result = stdext::dec_to_hex(crc);
if (upperCase)
std::ranges::transform(result, result.begin(), toupper);
Expand Down
Loading