Repository navigation
Handle "out of memory" situation in Tr2CurveLineSet - #127
Open
filipppavlov wants to merge 2 commits into
Open
filipppavlov wants to merge 2 commits into
filipppavlov wants to merge 2 commits into
Conversation
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
There was a problem hiding this comment.
Cpp-linter Review
Used clang-format v21.1.8
Click here for the full clang-format patch
diff --git a/trinity/Tr2CurveLineSet.cpp b/trinity/Tr2CurveLineSet.cpp
index 98cb7b9..7e0bc00 100644
--- a/trinity/Tr2CurveLineSet.cpp
+++ b/trinity/Tr2CurveLineSet.cpp
@@ -378 +378 @@ bool Tr2CurveLineSet::FillVertexBuffer()
- if ( !buffer )
+ if( !buffer )
Have any feedback or feature suggestions? Share it here.
|
|
||
| size_t byteSize = size_t( std::max( currentNumOfLines, m_vertexBufferSize ) ) * 6 * sizeof( LineVertex ); | ||
| auto buffer = Tr2Renderer::GetPoolAllocator()->Allocate( byteSize ); | ||
| if ( !buffer ) |
There was a problem hiding this comment.
clang-format suggestion
Suggested change
| if ( !buffer ) | |
| if( !buffer ) |
| // can the big vertexbuffer handle this? | ||
| int currentNumOfLines = GetNumOfLines(); | ||
|
|
||
| size_t byteSize = size_t( std::max( currentNumOfLines, m_vertexBufferSize ) ) * 6 * sizeof( LineVertex ); |
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
We are observing crashes in
Tr2CurveLineSetwhen it cannot allocate enough RAM to upload data to itsvertex buffer. Add a check and an early exit when it fails to allocate memory.
Linked issue (optional)
https://fenriscreations.atlassian.net/browse/PLAT-10759
Testing
Tested locally with an artificial repro script.