Merge branch 'master' into AddRAK12035VB_4.19.25

Fix warning
working out trunk formatting..
2025-10-07 15:12:45 +00:00 · 2025-05-07 09:41:43 -06:00 · 2025-05-07 09:26:10 -05:00 · 2025-05-07 08:09:44 -06:00 · 2025-05-07 06:28:18 -05:00
3 changed files with 4 additions and 4 deletions
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -6,7 +6,7 @@
  "files.trimFinalNewlines": false,
  "cmake.configureOnOpen": false,
  "[cpp]": {
-    "editor.defaultFormatter": "ms-vscode.cpptools"
+    "editor.defaultFormatter": "trunk.io"
  },
  "[powershell]": {
    "editor.defaultFormatter": "ms-vscode.powershell"
--- a/SECURITY.md
+++ b/SECURITY.md
@ -4,8 +4,8 @@
 | Firmware Version | Supported          |
 | ---------------- | ------------------ |
-| 2.5.x            | :white_check_mark: |
+| 2.6.x            | :white_check_mark: |
-| <= 2.4.x         | :x:                |
+| <= 2.5.x         | :x:                |
 ## Reporting a Vulnerability
--- a/src/modules/SerialModule.cpp
+++ b/src/modules/SerialModule.cpp
@ -513,7 +513,7 @@ void SerialModule::processWXSerial()
                    // Extract the current line
                    char line[meshtastic_Constants_DATA_PAYLOAD_LEN];
                    memset(line, '\0', sizeof(line));
-                    if (lineEnd - lineStart < sizeof(line) - 1) {
+                    if ((size_t)(lineEnd - lineStart) < sizeof(line) - 1) {
                        memcpy(line, &serialBytes[lineStart], lineEnd - lineStart);
                        ParsedLine parsed = parseLine(line);
Author	SHA1	Message	Date
Justin E. Mann	3fcb2ab383	Merge branch 'master' into AddRAK12035VB_4.19.25	2025-05-07 09:41:43 -06:00
Ben Meadors	6f256c06f6	Fix warning	2025-05-07 09:26:10 -05:00
Justin E. Mann	ab0d76f45f	working out trunk formatting..	2025-05-07 08:09:44 -06:00
Benjamin Faershtein	86217111b2	Update SECURITY.md (#6757 )	2025-05-07 06:28:18 -05:00