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

backport: bitcoin#18867, #19247, #19222, #18363, #18190, #18393, partial #18047, #18314, #19143 (fuzzing harness backports: part 3) #4886

Merged
merged 13 commits into from
Jul 17, 2022

Conversation

@kwvg kwvg marked this pull request as draft June 14, 2022 18:17
@github-actions
Copy link

This pull request has conflicts, please rebase.

@github-actions
Copy link

This pull request has conflicts, please rebase.

@kwvg kwvg force-pushed the fuzz3 branch 4 times, most recently from 764e2c7 to 7788006 Compare July 6, 2022 19:32
@kwvg kwvg marked this pull request as ready for review July 13, 2022 03:46
@kwvg kwvg requested review from PastaPastaPasta and UdjinM6 July 13, 2022 04:49
Copy link
Member

@PastaPastaPasta PastaPastaPasta left a comment

Choose a reason for hiding this comment

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

utACK for merging via merge commit
utACK for merging via merge commit

@UdjinM6 UdjinM6 added this to the 18.1 milestone Jul 13, 2022
@thephez
Copy link
Collaborator

thephez commented Jul 13, 2022

utACK for merging via merge commit utACK for merging via merge commit

@PastaPastaPasta Thanks for reviewing. Your response was a little vague though. My only question is, could you let us know if you will utACK this for merging via a merge commit? :trollface:

Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

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

Can't compile:

In file included from test/fuzz/addition_overflow.cpp:7:
./test/fuzz/util.h:265:13: error: no matching function for call to 'AdditionOverflow'
        if (AdditionOverflow((uint64_t)fuzzed_file->m_offset, random_bytes.size())) {
            ^~~~~~~~~~~~~~~~
./test/fuzz/util.h:131:20: note: candidate template ignored: deduced conflicting types for parameter 'T' ('unsigned long long' vs. 'unsigned long')
[[nodiscard]] bool AdditionOverflow(const T i, const T j) noexcept
                   ^
./test/fuzz/util.h:276:13: error: no matching function for call to 'AdditionOverflow'
        if (AdditionOverflow(fuzzed_file->m_offset, n)) {
            ^~~~~~~~~~~~~~~~
./test/fuzz/util.h:131:20: note: candidate template ignored: deduced conflicting types for parameter 'T' ('long long' vs. 'long')
[[nodiscard]] bool AdditionOverflow(const T i, const T j) noexcept
                   ^
2 errors generated.

dropping 60aa00a helps

Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

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

utACK

Copy link
Member

@PastaPastaPasta PastaPastaPasta left a comment

Choose a reason for hiding this comment

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

utACK for merging via merge commit

@PastaPastaPasta PastaPastaPasta merged commit 30d6584 into dashpay:develop Jul 17, 2022
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.

4 participants