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

Fix incorrect loop condition (backport #1752) #1755

Merged
merged 1 commit into from
Jul 1, 2021
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 30, 2021

This is an automatic backport of pull request #1752 done by Mergify.
Cherry-pick of 86d0a1d has failed:

On branch mergify/bp/main/pr-1752
Your branch is up to date with 'origin/main'.

You are currently cherry-picking commit 86d0a1d5.
  (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:
	new file:   test/data/issue_ghsa_mxw9_qx4c_6m8v_poc.jp2
	modified:   tests/bugfixes/github/test_issue_ghsa_8949_hhfh_j7rj.py
	new file:   tests/bugfixes/github/test_issue_ghsa_mxw9_qx4c_6m8v.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://help.github.com/articles/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/

src/jp2image.cpp Outdated
enforce(sizeof(Jp2BoxHeader) <= length - count, Exiv2::kerCorruptedMetadata);
auto pSubBox = reinterpret_cast<Jp2BoxHeader*>(p + count);

// copy data. pointer could be into a memory mapped file which we will decode!
<<<<<<< HEAD
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Haha, I see it was already fixed on main.

@codecov
Copy link

codecov bot commented Jul 1, 2021

Codecov Report

Merging #1755 (52b7300) into main (8c4d67c) will increase coverage by 0.14%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #1755      +/-   ##
==========================================
+ Coverage   66.94%   67.08%   +0.14%     
==========================================
  Files         151      151              
  Lines       20794    20792       -2     
==========================================
+ Hits        13920    13949      +29     
+ Misses       6874     6843      -31     
Impacted Files Coverage Δ
src/jp2image.cpp 84.49% <100.00%> (+7.88%) ⬆️

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 8c4d67c...52b7300. Read the comment docs.

@hassec hassec merged commit d30c95d into main Jul 1, 2021
@mergify mergify bot deleted the mergify/bp/main/pr-1752 branch July 1, 2021 17:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants