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.

Sign up for GitHub

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

Jump to bottom

Prevent max call stack when merging overlapping keys #483

Merged
merged 4 commits into from May 8, 2019
Merged

Prevent max call stack when merging overlapping keys #483

merged 4 commits into from May 8, 2019

Commits on May 7, 2019

  1. Add test coverage that triggers Maximum call stack exception

    @timhudson
    timhudson committed May 7, 2019
    Copy the full SHA
    f5e5c28 View commit details
    Browse the repository at this point in the history

  2. Check that values are objects before merging

    @timhudson
    timhudson committed May 7, 2019
    Copy the full SHA
    926f9f6 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2019

  1. Add realistic variant test case

    @timhudson
    timhudson committed May 8, 2019
    Copy the full SHA
    bc70315 View commit details
    Browse the repository at this point in the history

  2. Simplify merge conditional

    @timhudson
    timhudson committed May 8, 2019
    Copy the full SHA
    cc67fbb View commit details
    Browse the repository at this point in the history