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 #1011 fix_1011_jp2_readmetadata_loop (bp #1013) #1016

Merged
merged 1 commit into from
Nov 18, 2019

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 5, 2019

This is an automated backport of pull request #1013 done by Mergify.io

Cherry-pick of 1b917c3 has failed:

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

You are currently cherry-picking commit 1b917c3f7.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	new file:   test/data/Jp2Image_readMetadata_loop.poc
	modified:   tests/bugfixes/github/test_CVE_2017_17725.py
	new file:   tests/bugfixes/github/test_issue_1011.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   src/jp2image.cpp

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

@@ -198,6 +194,16 @@ namespace Exiv2
return result;
}

static void boxes_check(size_t b,size_t m)
Copy link
Member

Choose a reason for hiding this comment

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

This check seems a little arbitrary to me, maybe we should find out why there's an infinite loop in the first place?

Copy link
Collaborator

Choose a reason for hiding this comment

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

I agree in which it seems a bit arbitraty (or at least we do not have a reference to know about the maximum number of boxes). My approach would be to try to merge this as it is, and create another issue to investigate about this in the future.

I was searching the JPEG 2000 specification, but it seems it is not publicly available 😢
https://www.iso.org/standard/37674.html

(cherry picked from commit 1b917c3)
@piponazo
Copy link
Collaborator

I fixed the conflicts in this automatic PR. I will merge the changes as soon as CI is green and create a ticket to investigate the issue raised by @D4N

@codecov
Copy link

codecov bot commented Nov 18, 2019

Codecov Report

Merging #1016 into master will decrease coverage by 0.01%.
The diff coverage is 81.81%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1016      +/-   ##
==========================================
- Coverage   71.24%   71.23%   -0.02%     
==========================================
  Files         148      148              
  Lines       19456    19466      +10     
==========================================
+ Hits        13861    13866       +5     
- Misses       5595     5600       +5
Impacted Files Coverage Δ
src/jp2image.cpp 36.81% <81.81%> (+0.93%) ⬆️
src/actions.cpp 74.61% <0%> (-0.18%) ⬇️

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 02e2a52...935b44b. Read the comment docs.

@piponazo piponazo merged commit 55af053 into master Nov 18, 2019
@piponazo piponazo deleted the mergify/bp/master/pr-1013 branch November 18, 2019 18:29
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.

3 participants