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

Safer std::vector indexing (backport #1769) #1786

Merged
merged 4 commits into from
Jul 25, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 17, 2021

This is an automatic backport of pull request #1769 done by Mergify.
Cherry-pick of 76e3137 has failed:

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

You are currently cherry-picking commit 76e31374.
  (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:   samples/addmoddel.cpp
	modified:   samples/exiv2json.cpp
	modified:   src/exiv2.cpp
	modified:   src/minoltamn_int.cpp
	modified:   src/properties.cpp
	modified:   src/sigmamn_int.cpp
	modified:   src/tiffvisitor_int.cpp
	modified:   src/types.cpp
	modified:   src/utils.cpp
	modified:   src/xmp.cpp
	modified:   src/xmpsidecar.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/actions.cpp
	both modified:   src/basicio.cpp
	both modified:   src/convert.cpp
	both modified:   src/tags_int.cpp
	both modified:   src/value.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 Jul 18, 2021

Codecov Report

Merging #1786 (637a765) into main (6373fe3) will increase coverage by 0.02%.
The diff coverage is 80.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #1786      +/-   ##
==========================================
+ Coverage   67.49%   67.51%   +0.02%     
==========================================
  Files         151      151              
  Lines       20815    20868      +53     
==========================================
+ Hits        14050    14090      +40     
- Misses       6765     6778      +13     
Impacted Files Coverage Δ
src/tiffvisitor_int.cpp 87.51% <ø> (ø)
src/actions.cpp 74.03% <36.36%> (-0.11%) ⬇️
samples/addmoddel.cpp 88.67% <100.00%> (ø)
samples/exiv2json.cpp 75.60% <100.00%> (ø)
src/basicio.cpp 56.68% <100.00%> (ø)
src/exiv2.cpp 66.03% <100.00%> (ø)
src/minoltamn_int.cpp 59.13% <100.00%> (ø)
src/properties.cpp 80.09% <100.00%> (ø)
src/sigmamn_int.cpp 69.56% <100.00%> (ø)
src/tags_int.cpp 87.20% <100.00%> (ø)
... and 10 more

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 6373fe3...637a765. Read the comment docs.

kevinbackhouse added a commit to kevinbackhouse/exiv2 that referenced this pull request Jul 23, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants