Fix crash in levelshot command #264
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
Setting packAlign was removed [1] and later set to 0 [2] and this caused PADP( ..., 0 ) to return NULL which later gets passed to R_GammaCorrect() and crashed. It seems I left packAlign in my PNG/levelshot changes [3] even though it's not needed in R_LevelShot(). Set packAlign to 1 which is single byte alignment and doesn't allocate additional memory. PADP( ..., 1 ) returns the same address and it doesn't crash later. 1: b514a01 2: 688f4f5 3: ioquake/ioq3#262
Fix using offset for source returned by RB_ReadPixels(). In practice this shouldn't be an issue because Hunk_AllocateTempMemory() should already be aligned to sizeof(intptr_t).
Filling the resample buffer didn't correctly handle offset for packAlign if it didn't match the alignment returned by Hunk_AllocateTempMemory(). There isn't SIMD or something that the code wants a specific alignment. Hunk_AllocateTempMemory() is aligned to sizeof(intptr_t) anyway so there isn't a reason to add a memory alignment here.
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.
This fixes the game crashing in opengl1 and OpenGL2 renderers when running the
levelshotcommand. It also fixes incorrect usage of memory alignment handling for source and resample buffers from my ioq3 PR this is based on.Fixes #256.