fix jpeg buffer too small #1548
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
Closed
|
Confirmed issue was present in Debian Stretch running 1.29.0, updated to 1.30.0-rc1 still present, applied this PR and issue resolved. |
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 #1547
This PR attempts to solve the issue by splitting out jpg_dcinfo and jpg_ccinfo into four different structures.
jpg_dcinfo becomes readjpg_dcinfo and decodejpg_dcinfo
jpg_ccinfo becomes writejpg_ccinfo and encodejpg_ccinfo
By splitting these out in this manner, ZoneMinder no longer tries to use a cinfo structure, which was created in a different part of the ZoneMinder source code, which is what caused the libjpeg-turbo library to complain with ERREXITJERR_BUFFER_SIZE.
Note that a better solution could possibly be obtained by eliminating the duplicate jpeg library source code found in zm_jpeg.cpp. However, I do not have a clear enough understanding of why it is there in the first place to attempt it at this time.