Preserve UTF-8 boundaries in advert names - #3004
Merged
ripplebiz merged 1 commit intoJul 30, 2026
Merged
Conversation
axhoff
marked this pull request as ready for review
July 20, 2026 14:51
hermes-gadget
added a commit
to gadgethd/MeshCore-MQTT
that referenced
this pull request
Jul 30, 2026
Upstream dev: 449f0b5..db23280 (22 commits) - PR meshcore-dev#2688: room_server system posts (3a9f19c, 5a04e06, db23280) - PR meshcore-dev#3004: preserve UTF-8 advert names (79dc1de, 57ddada) - PR meshcore-dev#3060: fix mesh-debug-active (d7f378b, b797ca1) - PR meshcore-dev#3063: unify IRQ timeout (a5c323c, a3732e1, 79eb7f5, a7426de, 6e39cff) - PR meshcore-dev#3062: fix IRQ clear (20f55a4, 9f73fbf) - PR meshcore-dev#3049: ethernet refactor (5de857f, b4143a4, e672679, 203fd4e, 834ad72, 279ac78) - USB companion flag requirement (e7f2c71) - Bluetooth toggle on UI tiny (dd778e2) Conflicts resolved: - variants/mesh_pocket/platformio.ini: USB companion AUTO_OFF_MILLIS + ENABLE_USB_INTERFACE Clean auto-merge (no conflicts) in all MQTT files — guard pattern held. MQTT additions preserved.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Root cause
AdvertDataBuilder::encodeTo()copied names until the raw byte budget was exhausted. Location data leaves 23 bytes for the name, so a 24-byte name could be cut inside a multi-byte code point and emitted as invalid UTF-8.Scope
The defensive check is at the final encoder, so it protects names saved by older firmware as well as current input paths. The packet layout and byte budgets are unchanged; only the valid prefix that fits is emitted.
Validation
git diff --checkpio test -e native— 17/17 tests passedpio run -e Heltec_v3_repeaterFixes #2613