Fix #365 #378
Merged
Fix #365 #378
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
| @@ -203,14 +203,19 @@ void plRegistryKeyList::Read(hsStream* s) | |||
| s->ReadByte(); | |||
|
|
|||
| uint32_t numKeys = s->ReadLE32(); | |||
| fKeys.reserve(numKeys); | |||
| fKeys.reserve(static_cast<size_t>(numKeys * 1.5f)); | |||
There was a problem hiding this comment.
numkeys * 3 / 2 might be saner... I'm not sure I like going through a float :/
plRegistryKeyList::Read assumed that plUoid object IDs are always sequential. This is not the case since f664e8b resulted in all keys getting an ID. The problem manifested itself here because there were temporary materials that were being created and thrown away, causing object ID gaps.
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.
plRegistryKeyList::Readassumed thatplUoidobject IDs are always sequential. This is not the case since f664e8b resulted in all keys getting an ID. The problem manifested itself here because there were temporary materials that were being created and thrown away, causing object ID gaps.This may also address #366, however this is untested.