requester: fix memory corruption and refactor #1393
Merged
Conversation
This file contains 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
walkawayy
force-pushed
the
requester-rework
branch
from
dad8ce1
to
058f84b
Compare
rr-
reviewed
Jun 27, 2024
walkawayy
force-pushed
the
requester-rework
branch
from
59c746d
to
b7ff38a
Compare
walkawayy
commented
Jun 27, 2024
walkawayy
commented
Jun 27, 2024
rr-
reviewed
Jun 28, 2024
There was a problem hiding this comment.
I'd like to propose one last improvement - currently we have three array of pointers:
bool *item_blocked;
char **item_texts;
TEXTSTRING *texts[MAX_REQLINES];I think it'd be elegant to wrap these together in a new structure, REQUESTER_ITEM, and then allocate it once like so:
req->items = Memory_Alloc(sizeof(REQUESTER_ITEM) * max_items);
|
Ok I think this is looking a lot better. I removed even more unused vars, malloc the text header, and renamed the blocks for clarity. Tested in valgrind and this code has no memory leaks. |
Fixes issues with incorrectly sized items_flags, standardizes requestor functions, and switches to snprintf during savegame scanning.
walkawayy
force-pushed
the
requester-rework
branch
from
3ff777f
to
d38b1fb
Compare
walkawayy
added
Priority: high
rr-
approved these changes
Jul 1, 2024
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.
Fixes issues with incorrectly sized items_flags, standardizes requestor functions, and switches to snprintf during savegame scanning.
Checklist
Description
Part 2 of separating #1389 into more manageable pull requests. Fixes issues with incorrectly sized
items_flags, standardizes requestor functions, and switches to snprintf during savegame scanning. Part of the fix for #1374 as this fixes incorrectly sizeditems_flagswhich could cause memory corruption. The next and final PR will be the final fix for gameflow bit shifting limiting savegame slots to 64.