Skip to content

Add recursion depth limit (backport #9304)#9333

Open
mergify[bot] wants to merge 1 commit into
0.28.xfrom
mergify/bp/0.28.x/pr-9304
Open

Add recursion depth limit (backport #9304)#9333
mergify[bot] wants to merge 1 commit into
0.28.xfrom
mergify/bp/0.28.x/pr-9304

Conversation

@mergify

@mergify mergify Bot commented Jun 14, 2026

Copy link
Copy Markdown
Contributor

Fixes: #9303


This is an automatic backport of pull request #9304 done by Mergify.

(cherry picked from commit 781a469)

# Conflicts:
#	include/exiv2/asfvideo.hpp
@mergify mergify Bot added the conflicts label Jun 14, 2026
@mergify

mergify Bot commented Jun 14, 2026

Copy link
Copy Markdown
Contributor Author

Cherry-pick of 781a469 has failed:

On branch mergify/bp/0.28.x/pr-9304
Your branch is up to date with 'origin/0.28.x'.

You are currently cherry-picking commit 781a4690.
  (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:   src/asfvideo.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   include/exiv2/asfvideo.hpp

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

<<<<<<< HEAD
explicit AsfVideo(BasicIo::UniquePtr io);
=======
explicit AsfVideo(std::unique_ptr<BasicIo> io, size_t max_recursion_depth = 500);

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

API change, so skip for 0.28.9?

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.

2 participants