mirror of
https://github.com/CalcProgrammer1/OpenRGB.git
synced 2026-10-02 07:14:46 -04:00
Use std::string.assign when setting strings in the SDK protocol and description handlers so that string size limit is enforced, then strip out null terminators
This commit is contained in:
1 parent
5133887632
commit
4e70949aec
5 files changed
+39
-36
No files matched your search
@@ -45,11 +45,6 @@ json SettingsManager::GetSettings(std::string settings_key)
|
||||
json result;
|
||||
bool ui_settings_key = false;
|
||||
|
||||
/*-----------------------------------------------------*\
|
||||
| Remove any excess null termination from settings key |
|
||||
\*-----------------------------------------------------*/
|
||||
settings_key = StringUtils::remove_null_terminating_chars(settings_key);
|
||||
|
||||
for(std::size_t settings_key_idx = 0; settings_key_idx < 7; settings_key_idx++)
|
||||
{
|
||||
if(settings_key == ui_settings_keys[settings_key_idx])
|
||||
@@ -98,11 +93,6 @@ void SettingsManager::SetSettings(std::string settings_key, json new_settings)
|
||||
{
|
||||
bool ui_settings_key = false;
|
||||
|
||||
/*-----------------------------------------------------*\
|
||||
| Remove any excess null termination from settings key |
|
||||
\*-----------------------------------------------------*/
|
||||
settings_key = StringUtils::remove_null_terminating_chars(settings_key);
|
||||
|
||||
for(std::size_t settings_key_idx = 0; settings_key_idx < 7; settings_key_idx++)
|
||||
{
|
||||
if(settings_key == ui_settings_keys[settings_key_idx])
|
||||
|
||||
Reference in new issue
Block a user