Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nix
base: 8656a2de56e5
Choose a base ref
...
head repository: NixOS/nix
compare: 410acd29c046
Choose a head ref
  • 4 commits
  • 3 files changed
  • 2 contributors

Commits on Dec 13, 2019

  1. bugfix: Adding depth limit to resolveExprPath 

    There is no termination condition for evaluation of cyclical
expression paths which can lead to infinite loops. This addresses
one spot in the parser in a similar fashion as utils.cc/canonPath
does.

This issue can be reproduced by something like:

```
ln -s a b
ln -s b a

nix-instantiate -E 'import ./a'
```
    @d-goldin
    d-goldin committed Dec 13, 2019
    Copy the full SHA
    d89d995 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2019

  1. Merge branch 'limit_depth_resolveExprPath' of https://github.com/d-go… 

    …ldin/nix
    @edolstra
    edolstra committed Dec 14, 2019
    Copy the full SHA
    2b03657 View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2019

  1. Tweak error message

    @edolstra
    edolstra committed Dec 15, 2019
    Copy the full SHA
    acb71aa View commit details
    Browse the repository at this point in the history

  2. Fix cargo test

    @edolstra
    edolstra committed Dec 15, 2019
    Copy the full SHA
    410acd2 View commit details
    Browse the repository at this point in the history