add move semantics for message media references#7517
Open
Goober5000 wants to merge 1 commit into
Open
Conversation
MMessage's avi_info/wave_info unions hold strdup'd filenames in FRED (indices in the game), but moves copied the pointers without nulling the source, so every vector shift on Messages left moved-from elements aliasing live allocations -- one careless edit away from a double-free. Wrap each union in a MessageMediaRef struct whose moves null the source and whose copies stay shallow (the event editor's backup pattern copies then re-strdups). MMessage keeps its implicit copy and gains a correct implicit move; access syntax at all use sites is unchanged. Add a message_free_media_names() helper and use it at the FRED delete/wipe sites. Two fixes ride along: messages_init() now frees mission messages' media names before discarding them, closing a leak that fired on every mission load in FRED; and the message editor's OnDelete now uses the move-based array_remove_slot instead of a copy-shift that left a stale aliasing tail. No destructor: the active union member depends on Fred_running, and shallow copies alias, so freeing remains explicit. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Goober5000
added
cleanup
wookieejedi
approved these changes
Jun 13, 2026
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
2 participants
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.
MMessage's avi_info/wave_info unions hold strdup'd filenames in FRED (indices in the game), but moves copied the pointers without nulling the source, so every vector shift on Messages left moved-from elements aliasing live allocations -- one careless edit away from a double-free.
Wrap each union in a MessageMediaRef struct whose moves null the source and whose copies stay shallow (the event editor's backup pattern copies then re-strdups). MMessage keeps its implicit copy and gains a correct implicit move; access syntax at all use sites is unchanged.
Add a message_free_media_names() helper and use it at the FRED delete/wipe sites. Two fixes ride along: messages_init() now frees mission messages' media names before discarding them, closing a leak that fired on every mission load in FRED; and the message editor's OnDelete now uses the move-based array_remove_slot instead of a copy-shift that left a stale aliasing tail.
No destructor: the active union member depends on Fred_running, and shallow copies alias, so freeing remains explicit.