From e687c50b169e80b884306e6a7d1a150dd5c40f34 Mon Sep 17 00:00:00 2001 From: HalfSweet Date: Sun, 20 Apr 2025 21:41:41 +0800 Subject: [PATCH 1/2] fix: nickname --- projects/HSLink-Pro/src/setting.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/projects/HSLink-Pro/src/setting.cpp b/projects/HSLink-Pro/src/setting.cpp index d2a366e..00255a4 100644 --- a/projects/HSLink-Pro/src/setting.cpp +++ b/projects/HSLink-Pro/src/setting.cpp @@ -147,6 +147,9 @@ static std::string stringify_settings() writer.Key("jtag_20pin_compatible"); writer.Bool(HSLink_Setting.jtag_20pin_compatible); + writer.Key("nickname"); + writer.String(HSLink_Setting.nickname); + writer.EndObject(); return std::string{buffer.GetString(), buffer.GetSize()}; } @@ -187,6 +190,8 @@ static void parse_settings(std::string_view json) HSLink_Setting.led = root["led"].GetBool(); HSLink_Setting.led_brightness = root["led_brightness"].GetUint(); HSLink_Setting.jtag_20pin_compatible = get_json_value(root, "jtag_20pin_compatible", false); + + std::strcpy(HSLink_Setting.nickname, get_json_value(root, "nickname", "")); } static void load_settings() From 6e98096c7886c0b9941348ca79f5cbebf6c72d97 Mon Sep 17 00:00:00 2001 From: HalfSweet Date: Sun, 20 Apr 2025 21:46:46 +0800 Subject: [PATCH 2/2] fix --- projects/HSLink-Pro/src/setting.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/HSLink-Pro/src/setting.cpp b/projects/HSLink-Pro/src/setting.cpp index 00255a4..d87ed6e 100644 --- a/projects/HSLink-Pro/src/setting.cpp +++ b/projects/HSLink-Pro/src/setting.cpp @@ -191,7 +191,8 @@ static void parse_settings(std::string_view json) HSLink_Setting.led_brightness = root["led_brightness"].GetUint(); HSLink_Setting.jtag_20pin_compatible = get_json_value(root, "jtag_20pin_compatible", false); - std::strcpy(HSLink_Setting.nickname, get_json_value(root, "nickname", "")); + std::strncpy(HSLink_Setting.nickname, get_json_value(root, "nickname", ""), sizeof(HSLink_Setting.nickname) - 1); + HSLink_Setting.nickname[sizeof(HSLink_Setting.nickname) - 1] = '\0'; } static void load_settings()