Skip to content
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

jp2image.cpp: check size before allocation to avoid out-of-memory errors (backport #1814) #1825

Merged
merged 3 commits into from
Aug 2, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 1, 2021

This is an automatic backport of pull request #1814 done by Mergify.
Cherry-pick of 32a26ad has failed:

On branch mergify/bp/main/pr-1814
Your branch is ahead of 'origin/main' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 32a26add.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   tests/bugfixes/github/test_issue_1522.py
	modified:   tests/bugfixes/github/test_issue_1812.py
	modified:   tests/bugfixes/github/test_issue_ghsa_7569_phvm_vwc2.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/jp2image.cpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

@codecov
Copy link

codecov bot commented Aug 1, 2021

Codecov Report

Merging #1825 (ffde235) into main (c65941c) will increase coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@           Coverage Diff           @@
##             main    #1825   +/-   ##
=======================================
  Coverage   60.51%   60.52%           
=======================================
  Files          96       96           
  Lines       18845    18857   +12     
  Branches     9469     9477    +8     
=======================================
+ Hits        11404    11413    +9     
+ Misses       5155     5154    -1     
- Partials     2286     2290    +4     
Impacted Files Coverage Δ
src/jp2image.cpp 68.76% <100.00%> (-0.34%) ⬇️
src/jpgimage.cpp 70.01% <0.00%> (-0.27%) ⬇️
src/actions.cpp 61.21% <0.00%> (+0.32%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c65941c...ffde235. Read the comment docs.

@kevinbackhouse kevinbackhouse merged commit 34aa899 into main Aug 2, 2021
@mergify mergify bot deleted the mergify/bp/main/pr-1814 branch August 2, 2021 13:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants