New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix out of bounds copy in LoadBorders() #775
Merged
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
veluca93
reviewed
Oct 26, 2021
veluca93
reviewed
Oct 26, 2021
veluca93
previously approved these changes
Oct 26, 2021
veluca93
previously approved these changes
Oct 26, 2021
veluca93
previously approved these changes
Oct 26, 2021
When processing groups out of order with an image where the last group size is smaller than the needed border it was possible to attempt to load the right or bottom border from the next group when already processing the rightmost or bottom group respectively. This situation was causing an out-of-bounds copy on saved Image3F buffer in release mode (or hitting a JXL_DASSERT in debug mode). The order in which the groups are processed depends on many factors, including the order in which the threads are scheduled when using multiple threads, and potentially the order of the groups in the file (not checked). Added a test to force the out-of-order situation in a simulated parallel runner that forces a random order on the tasks. The new test triggers the assert in debug mode, which is now fixed. Fixes libjxl#708.
veluca93
approved these changes
Oct 26, 2021
deymo
added a commit
to deymo/libjxl
that referenced
this pull request
Oct 27, 2021
When processing groups out of order with an image where the last group size is smaller than the needed border it was possible to attempt to load the right or bottom border from the next group when already processing the rightmost or bottom group respectively. This situation was causing an out-of-bounds copy on saved Image3F buffer in release mode (or hitting a JXL_DASSERT in debug mode). The order in which the groups are processed depends on many factors, including the order in which the threads are scheduled when using multiple threads, and potentially the order of the groups in the file (not checked). Added a test to force the out-of-order situation in a simulated parallel runner that forces a random order on the tasks. The new test triggers the assert in debug mode, which is now fixed. Fixes libjxl#708. (cherry picked from commit e649705) (cherry picked from PR libjxl#775)
deymo
added a commit
to deymo/libjxl
that referenced
this pull request
Oct 27, 2021
When processing groups out of order with an image where the last group size is smaller than the needed border it was possible to attempt to load the right or bottom border from the next group when already processing the rightmost or bottom group respectively. This situation was causing an out-of-bounds copy on saved Image3F buffer in release mode (or hitting a JXL_DASSERT in debug mode). The order in which the groups are processed depends on many factors, including the order in which the threads are scheduled when using multiple threads, and potentially the order of the groups in the file (not checked). Added a test to force the out-of-order situation in a simulated parallel runner that forces a random order on the tasks. The new test triggers the assert in debug mode, which is now fixed. (cherry picked from commit e649705) (cherry picked from PR libjxl#775) Adapted the cherry-pick to use <random> in the test instead of "lib/jxl/random.h" since the latter is not available in v0.6.x branch.
deymo
added a commit
to deymo/libjxl
that referenced
this pull request
Oct 27, 2021
When processing groups out of order with an image where the last group size is smaller than the needed border it was possible to attempt to load the right or bottom border from the next group when already processing the rightmost or bottom group respectively. This situation was causing an out-of-bounds copy on saved Image3F buffer in release mode (or hitting a JXL_DASSERT in debug mode). The order in which the groups are processed depends on many factors, including the order in which the threads are scheduled when using multiple threads, and potentially the order of the groups in the file (not checked). Added a test to force the out-of-order situation in a simulated parallel runner that forces a random order on the tasks. The new test triggers the assert in debug mode, which is now fixed. (cherry picked from commit e649705) (cherry picked from PR libjxl#775) Adapted the cherry-pick to use <random> in the test instead of "lib/jxl/random.h" since the latter is not available in v0.6.x branch.
deymo
added a commit
that referenced
this pull request
Oct 27, 2021
When processing groups out of order with an image where the last group size is smaller than the needed border it was possible to attempt to load the right or bottom border from the next group when already processing the rightmost or bottom group respectively. This situation was causing an out-of-bounds copy on saved Image3F buffer in release mode (or hitting a JXL_DASSERT in debug mode). The order in which the groups are processed depends on many factors, including the order in which the threads are scheduled when using multiple threads, and potentially the order of the groups in the file (not checked). Added a test to force the out-of-order situation in a simulated parallel runner that forces a random order on the tasks. The new test triggers the assert in debug mode, which is now fixed. (cherry picked from commit e649705) (cherry picked from PR #775) Adapted the cherry-pick to use <random> in the test instead of "lib/jxl/random.h" since the latter is not available in v0.6.x branch.
2 tasks
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.
When processing groups out of order with an image where the last group
size is smaller than the needed border it was possible to attempt to
load the right or bottom border from the next group when already
processing the rightmost or bottom group respectively. This situation
was causing an out-of-bounds copy on saved Image3F buffer in release
mode (or hitting a JXL_DASSERT in debug mode).
The order in which the groups are processed depends on many factors,
including the order in which the threads are scheduled when using
multiple threads, and potentially the order of the groups in the file
(not checked).
Added a test to force the out-of-order situation in a simulated parallel
runner that forces a random order on the tasks. The new test triggers
the assert in debug mode, which is now fixed.
Fixes #708.