fix(jpeg2000): Suppress leak when reading with OpenJPH#5098
Merged
lgritz merged 2 commits intoAcademySoftwareFoundation:mainfrom Mar 23, 2026
Merged
fix(jpeg2000): Suppress leak when reading with OpenJPH#5098lgritz merged 2 commits intoAcademySoftwareFoundation:mainfrom
lgritz merged 2 commits intoAcademySoftwareFoundation:mainfrom
Conversation
The jph_infile class itself did not change, it just moved up in the file to be defined before it was used. It's the use of the persistent unique_ptr that fixes the leak. Signed-off-by: Larry Gritz <lg@larrygritz.com>
Collaborator
Author
|
The Mac Intel CI failure doesn't appear to be at all related to this PR. |
Collaborator
Author
|
Comments? Don't let the size of the diff fool you -- the big change is just code movement, not editing. It's only a few lines of changed code to convert a raw allocation (that could leak) to a unique_ptr that can't. |
jessey-git
reviewed
Mar 23, 2026
| opj_stream_t* m_stream; | ||
| bool m_keep_unassociated_alpha; // Do not convert unassociated alpha | ||
| #ifdef USE_OPENJPH | ||
| std::unique_ptr<jph_infile> m_jphinfile; |
Contributor
There was a problem hiding this comment.
Can we shift this down to the existing USE_OPENJPH section at the bottom of the class since this belongs with the codestream member.
…related Signed-off-by: Larry Gritz <lg@larrygritz.com>
lgritz
merged commit 6145def
into
AcademySoftwareFoundation:main
57 of 58 checks passed
lgritz
added a commit
to lgritz/OpenImageIO
that referenced
this pull request
Mar 24, 2026
…reFoundation#5098) The jph_infile class itself did not change, it just moved up in the file to be defined before it was used. It's the use of the persistent unique_ptr that fixes the leak. --------- Signed-off-by: Larry Gritz <lg@larrygritz.com>
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.
The jph_infile class itself did not change, it just moved up in the file to be defined before it was used. It's the use of the persistent unique_ptr that fixes the leak.