Skip to content

Conversation

maflcko
Copy link
Member

@maflcko maflcko commented Feb 9, 2020

Closes #17742

MarcoFalke added 2 commits February 9, 2020 07:43
98261b1 Merge #22: Clamp JSON object depth to PHP limit
54c4015 Clamp JSON object depth to PHP limit

git-subtree-dir: src/univalue
git-subtree-split: 98261b1
@maflcko maflcko added this to the 0.20.0 milestone Feb 9, 2020
laanwj added a commit that referenced this pull request Feb 10, 2020
5e17280 Squashed 'src/univalue/' changes from 7890db9..98261b1 (MarcoFalke)

Pull request description:

  Version bump backported from #18099

ACKs for top commit:
  laanwj:
    ACK fa4d00b

Tree-SHA512: dc34c98d9b1f450db700633ce7b674a3edf83bd12f3b77b74544a6b24f3e3b1f3c91f40d0ad6c27f82c1b26e88cf7625311b93f00e492a813dbdcca9f461cb5e
Copy link
Member

@fanquake fanquake left a comment

Choose a reason for hiding this comment

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

ACK fad9ea8

./test/lint/git-subtree-check.sh src/univalue
src/univalue in HEAD currently refers to tree 3ebb64da63fa27ad0a305c3e83fa89a85648eb24
src/univalue in HEAD was last updated in commit 97aa5740c0e9ef433cbedafe689b641297b50f5e (tree 3ebb64da63fa27ad0a305c3e83fa89a85648eb24)
src/univalue in HEAD was last updated to upstream commit 98261b1e7be4ce9820e25c8ce37d40cdef19ab20 (tree 3ebb64da63fa27ad0a305c3e83fa89a85648eb24)
GOOD

fanquake added a commit that referenced this pull request Feb 10, 2020
97aa574 Squashed 'src/univalue/' changes from 5a58a46..98261b1 (MarcoFalke)

Pull request description:

  Closes #17742

ACKs for top commit:
  fanquake:
    ACK fad9ea8

Tree-SHA512: 6316cb0e974ee6575e2a98930203dc7d155b346d2d2fe5a322e3d8b77a87d378d31fde16ea2f90ff93736429ddb89799a26945de13ce4a20132550bbcec0a48e
@fanquake fanquake merged commit fad9ea8 into bitcoin:master Feb 10, 2020
@maflcko maflcko deleted the 2002-univalueBump branch February 10, 2020 12:57
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Jul 17, 2021
97aa574 Squashed 'src/univalue/' changes from 5a58a46..98261b1 (MarcoFalke)

Pull request description:

  Closes bitcoin#17742

ACKs for top commit:
  fanquake:
    ACK fad9ea8

Tree-SHA512: 6316cb0e974ee6575e2a98930203dc7d155b346d2d2fe5a322e3d8b77a87d378d31fde16ea2f90ff93736429ddb89799a26945de13ce4a20132550bbcec0a48e
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Feb 15, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

UniValue upgrade needed to avoid UniValue CVE-2019-18936 (segfault via high object depth JSON)
3 participants