YangWX/crossdesk
1
0
Fork 0
mirror of https://github.com/kunkundi/crossdesk.git synced 2025-12-17 04:26:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

[fix] call memset() before using strncpy()

Browse Source
This commit is contained in:
dijunkun
2024-08-13 17:07:19 +08:00
parent d1f3d11318
commit 2cde54cf30
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/single_window/render.cpp
View File

@@ -74,7 +74,9 @@ int Render::SaveSettingsIntoCacheFile() {
} }
fseek(cd_cache_file_, 0, SEEK_SET); fseek(cd_cache_file_, 0, SEEK_SET);
memset(&cd_cache_.client_id, 0, sizeof(cd_cache_.client_id));
strncpy(cd_cache_.client_id, client_id_, sizeof(client_id_)); strncpy(cd_cache_.client_id, client_id_, sizeof(client_id_));
memset(&cd_cache_.password, 0, sizeof(cd_cache_.password));
strncpy(cd_cache_.password, password_saved_.c_str(), strncpy(cd_cache_.password, password_saved_.c_str(),
password_saved_.length()); password_saved_.length());
memcpy(&cd_cache_.language, &language_button_value_, memcpy(&cd_cache_.language, &language_button_value_,
@@ -125,6 +127,7 @@ int Render::LoadSettingsFromCacheFile() {
fread(&cd_cache_, sizeof(cd_cache_), 1, cd_cache_file_); fread(&cd_cache_, sizeof(cd_cache_), 1, cd_cache_file_);
fclose(cd_cache_file_); fclose(cd_cache_file_);
memset(&cd_cache_.client_id, 0, sizeof(cd_cache_.client_id));
strncpy(client_id_, cd_cache_.client_id, sizeof(client_id_)); strncpy(client_id_, cd_cache_.client_id, sizeof(client_id_));
password_saved_ = cd_cache_.password; password_saved_ = cd_cache_.password;
language_button_value_ = cd_cache_.language; language_button_value_ = cd_cache_.language;

1
src/single_window/render_callback_func.cpp
View File

@@ -237,6 +237,7 @@ void Render::NetStatusReport(int client_id, TraversalMode mode,
Render *render = (Render *)user_data; Render *render = (Render *)user_data;
if (client_id != 0 && 0 == strcmp(render->client_id_, "")) { if (client_id != 0 && 0 == strcmp(render->client_id_, "")) {
std::string client_id_s = std::to_string(client_id); std::string client_id_s = std::to_string(client_id);
memset(&render->client_id_, 0, sizeof(render->client_id_));
strncpy(render->client_id_, client_id_s.c_str(), strncpy(render->client_id_, client_id_s.c_str(),
sizeof(render->client_id_)); sizeof(render->client_id_));
LOG_INFO("Use client id [{}] and save id into cache file", client_id_s); LOG_INFO("Use client id [{}] and save id into cache file", client_id_s);

2
thirdparty/projectx vendored

Submodule thirdparty/projectx updated: e2e053a285...5f8e60d1c8